Revert changes to caching