Clean up cache_key some