Fix Race Conditions Due to Caching and Canceling by John Lindquist