Updated cache_keys to avoid accidental hits