Re-enabled local caching