Fixes for caching in 2.5