Avoid hangs and inadvertent cache destruction