*actually* fix caching