Refactor cache keys