Fix some error cases in the caching layer.