Navigation, Sitemap and Overview caching, minor refactorings