Merge pull request #14581 from seamuslee001/convert_navigation_cache