Merge "Rename some cache keys with odd virtual hierarchies"