Support deeper failure cases with the current caching