fixing cache keys