changes to pages, implementing caching from master