Merge pull request #1648 from vlakoff/page-cache

output->_display_cache() simplifications