Fixed cache key bug