safer caching, and reenabling async caching