Rename cache keys