Initial NavCache removal support

Change-Id: I927005093b620a1b1b60703bc8a58de539bdf3c8
3 files changed