Fix broken cache keys