A few more fixes for caching