Switch to core.cache instead of atom caching