Fixes caching in theory