Data-only caching fix.