Small efficieny - didn't fix the deadlock i'm looking for though
Removed some unused caches
ent cache in progress
Revert "Removed some unused caches"

This reverts commit c9466a8159d46b5e5ca250198c951df8c068f823.