Try to fix caching