And... now caching works