Fixes for extra caching