Added extended caching, remove of dynamic pages