Fix more caching issues