Temporarily disable caching to fix bug