Fixing cache keys [ci skip]