fix caching, again