Refactaring caching content