Could you move this to a separate PR? It's a behavior change that breaks compatibility with a lot of OkHttp releases, and probably some AOSP releases. Whether or not we want it, it shouldn't be in this response caching change.