cache the navigation queries
Merge branch 'master' into 2.3