diff --git a/tensorflow/core/tpu/kernels/tpu_compilation_cache_grpc.cc b/tensorflow/core/tpu/kernels/tpu_compilation_cache_grpc.cc
index c3aa62805c0..1b21ad8bc70 100644
--- a/tensorflow/core/tpu/kernels/tpu_compilation_cache_grpc.cc
+++ b/tensorflow/core/tpu/kernels/tpu_compilation_cache_grpc.cc
@@ -66,9 +66,12 @@ grpc::TpuCompilationCacheService::Stub::Stub(
 grpc::TpuCompilationCacheService::Stub::AsyncGetTpuProgramRaw(
     ::grpc::ClientContext* context, const RequestType& request,
     ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory<
-      ResponseType>::Create(channel_.get(), cq, rpcmethod_get_tpu_program_,
-                            context, request, true);
+  ::grpc::ClientAsyncResponseReader<
+      grpc::TpuCompilationCacheService::ResponseType>* result =
+      ::grpc::internal::ClientAsyncResponseReaderHelper::Create<ResponseType>(
+          channel_.get(), cq, rpcmethod_get_tpu_program_, context, request);
+  result->StartCall();
+  return result;
 }
 
 ::grpc::ClientAsyncResponseReader<
@@ -76,9 +79,9 @@ grpc::TpuCompilationCacheService::Stub::AsyncGetTpuProgramRaw(
 grpc::TpuCompilationCacheService::Stub::PrepareAsyncGetTpuProgramRaw(
     ::grpc::ClientContext* context, const RequestType& request,
     ::grpc::CompletionQueue* cq) {
-  return ::grpc::internal::ClientAsyncResponseReaderFactory<
-      ResponseType>::Create(channel_.get(), cq, rpcmethod_get_tpu_program_,
-                            context, request, false);
+  return ::grpc::internal::ClientAsyncResponseReaderHelper::Create<
+      ResponseType>(channel_.get(), cq, rpcmethod_get_tpu_program_, context,
+                    request);
 }
 
 grpc::TpuCompilationCacheService::Service::Service() {