Improved navigation caching.