Fix #64 NonRetriableException when caching