Fixes caching