Fixed broken caching