Fixed disabled caching