diff --git a/hypertrace-core-graphql-grpc-utils/src/main/java/org/hypertrace/core/graphql/utils/grpc/DefaultGrpcChannelRegistry.java b/hypertrace-core-graphql-grpc-utils/src/main/java/org/hypertrace/core/graphql/utils/grpc/DefaultGrpcChannelRegistry.java
index 7e9437ad..2bf161c5 100644
--- a/hypertrace-core-graphql-grpc-utils/src/main/java/org/hypertrace/core/graphql/utils/grpc/DefaultGrpcChannelRegistry.java
+++ b/hypertrace-core-graphql-grpc-utils/src/main/java/org/hypertrace/core/graphql/utils/grpc/DefaultGrpcChannelRegistry.java
@@ -1,44 +1,23 @@
 package org.hypertrace.core.graphql.utils.grpc;
 
 import io.grpc.ManagedChannel;
-import io.grpc.ManagedChannelBuilder;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.hypertrace.core.graphql.spi.lifecycle.GraphQlServiceLifecycle;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 @Singleton
 class DefaultGrpcChannelRegistry implements GrpcChannelRegistry {
-  private static final Logger LOG = LoggerFactory.getLogger(DefaultGrpcChannelRegistry.class);
-  private final Map<String, ManagedChannel> channelMap = new ConcurrentHashMap<>();
-  private volatile boolean isShutdown = false;
+
+  private final org.hypertrace.core.grpcutils.client.GrpcChannelRegistry delegate =
+      new org.hypertrace.core.grpcutils.client.GrpcChannelRegistry();
 
   @Inject
   DefaultGrpcChannelRegistry(GraphQlServiceLifecycle serviceLifecycle) {
-    serviceLifecycle.shutdownCompletion().thenRun(this::shutdown);
+    serviceLifecycle.shutdownCompletion().thenRun(this.delegate::shutdown);
   }
 
   @Override
   public ManagedChannel forAddress(String host, int port) {
-    assert !this.isShutdown;
-    String channelId = this.getChannelId(host, port);
-    return this.channelMap.computeIfAbsent(channelId, unused -> this.buildNewChannel(host, port));
-  }
-
-  private ManagedChannel buildNewChannel(String host, int port) {
-    LOG.info("Creating new channel for {}:{}", host, port);
-    return ManagedChannelBuilder.forAddress(host, port).usePlaintext().build();
-  }
-
-  private String getChannelId(String host, int port) {
-    return host + ":" + port;
-  }
-
-  private void shutdown() {
-    channelMap.values().forEach(ManagedChannel::shutdown);
-    this.isShutdown = true;
+    return this.delegate.forPlaintextAddress(host, port);
   }
 }