A few minor updates to take advantage of the improved cancellation behaviour in the cache.