Moved NavigationManager cache handling into custom methods for better readability...