Fix bad caching