Merge "Initial NavCache removal support"