Fix a few performance regressions where caches were not being read