Fix 5.9 caching