Merge "Delete more navcache stuff"