Merge commit 'e9db8335c01aa47799403b59718811ec703cfe61' * commit 'e9db8335c01aa47799403b59718811ec703cfe61': check to see if nav cache is up to date on tap