Navigation, Sitemap and Overview caching, minor refactorings
Merge pull request #182 from dlu-gs/hotfix/cache-nav-overview

Navigation, Sitemap and Overview caching, minor refactorings