Updated cache keys