Refactor cache key