Cache: deadlock fixed