Cachedkey fix