Added some caching of pages