Cache fix deadlock