Smarter cache invalidation on use of toggle_in_navigation()

And comments encouraging its use.