Merge "Rename legacy cache keys" into main