Re-enabled the caching