diff --git a/src/internal/cache/log_cache.go b/src/internal/cache/log_cache.go
index 4847f8261..f70fc9805 100644
--- a/src/internal/cache/log_cache.go
+++ b/src/internal/cache/log_cache.go
@@ -218,7 +218,7 @@ func (c *LogCache) setupRouting(s *store.Store) {
 	// Register peers and current node
 	for i, addr := range c.nodeAddrs {
 		if i != c.nodeIndex {
-			conn, err := grpc.Dial(addr, c.dialOpts...)
+			conn, err := grpc.NewClient(addr, c.dialOpts...)
 			if err != nil {
 				log.Printf("failed to dial %s: %s", addr, err)
 				continue
diff --git a/src/internal/cache/log_cache_test.go b/src/internal/cache/log_cache_test.go
index 5be528129..4b1b9a260 100644
--- a/src/internal/cache/log_cache_test.go
+++ b/src/internal/cache/log_cache_test.go
@@ -90,7 +90,7 @@ var _ = Describe("LogCache", func() {
 			clientTlsConfig.MaxVersion = uint16(clientTLSVersion)
 			clientTlsConfig.CipherSuites = []uint16{tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384}
 
-			insecureConn, err := grpc.Dial(
+			insecureConn, err := grpc.NewClient(
 				cache.Addr(),
 				grpc.WithTransportCredentials(
 					credentials.NewTLS(clientTlsConfig),
@@ -121,7 +121,7 @@ var _ = Describe("LogCache", func() {
 			clientTlsConfig.MaxVersion = tls.VersionTLS12
 			clientTlsConfig.CipherSuites = []uint16{clientCipherSuite}
 
-			insecureConn, err := grpc.Dial(
+			insecureConn, err := grpc.NewClient(
 				cache.Addr(),
 				grpc.WithTransportCredentials(
 					credentials.NewTLS(clientTlsConfig),
@@ -177,7 +177,7 @@ var _ = Describe("LogCache", func() {
 			{Timestamp: 4, SourceId: "src-zero"},
 		})
 
-		conn, err := grpc.Dial(cache.Addr(),
+		conn, err := grpc.NewClient(cache.Addr(),
 			grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
 		)
 		Expect(err).ToNot(HaveOccurred())
@@ -236,7 +236,7 @@ var _ = Describe("LogCache", func() {
 			},
 		})
 
-		conn, err := grpc.Dial(cache.Addr(),
+		conn, err := grpc.NewClient(cache.Addr(),
 			grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
 		)
 		Expect(err).ToNot(HaveOccurred())
@@ -279,7 +279,7 @@ var _ = Describe("LogCache", func() {
 			},
 		})
 
-		conn, err := grpc.Dial(cache.Addr(),
+		conn, err := grpc.NewClient(cache.Addr(),
 			grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
 		)
 		Expect(err).ToNot(HaveOccurred())
@@ -347,7 +347,7 @@ var _ = Describe("LogCache", func() {
 			{SourceId: "src-zero", Timestamp: 1},
 		})
 
-		conn, err := grpc.Dial(cache.Addr(),
+		conn, err := grpc.NewClient(cache.Addr(),
 			grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
 		)
 		Expect(err).ToNot(HaveOccurred())
@@ -386,7 +386,7 @@ var _ = Describe("LogCache", func() {
 			}
 		}
 
-		conn, err := grpc.Dial(cache.Addr(),
+		conn, err := grpc.NewClient(cache.Addr(),
 			grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
 		)
 		Expect(err).ToNot(HaveOccurred())
@@ -432,7 +432,7 @@ var _ = Describe("LogCache", func() {
 		defer cache.Close()
 		peer.MetaResponses = map[string]*rpc.MetaInfo{}
 
-		conn, err := grpc.Dial(cache.Addr(),
+		conn, err := grpc.NewClient(cache.Addr(),
 			grpc.WithTransportCredentials(insecure.NewCredentials()),
 		)
 		Expect(err).ToNot(HaveOccurred())
@@ -486,7 +486,7 @@ var _ = Describe("LogCache", func() {
 			},
 		}
 
-		conn, err := grpc.Dial(cache.Addr(),
+		conn, err := grpc.NewClient(cache.Addr(),
 			grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
 		)
 		Expect(err).ToNot(HaveOccurred())
@@ -536,7 +536,7 @@ func writeEnvelopes(addr string, es []*loggregator_v2.Envelope) {
 	if err != nil {
 		panic(err)
 	}
-	conn, err := grpc.Dial(addr,
+	conn, err := grpc.NewClient(addr,
 		grpc.WithTransportCredentials(credentials.NewTLS(tlsConfig)),
 	)
 	if err != nil {
@@ -564,7 +564,7 @@ func writeEnvelopes(addr string, es []*loggregator_v2.Envelope) {
 }
 
 func writeEnvelopesNoTLS(addr string, es []*loggregator_v2.Envelope) {
-	conn, err := grpc.Dial(addr,
+	conn, err := grpc.NewClient(addr,
 		grpc.WithTransportCredentials(insecure.NewCredentials()),
 	)
 	if err != nil {
diff --git a/src/internal/end2end/log_cache_test.go b/src/internal/end2end/log_cache_test.go
index 677e3d543..4dca54b61 100644
--- a/src/internal/end2end/log_cache_test.go
+++ b/src/internal/end2end/log_cache_test.go
@@ -123,7 +123,7 @@ var _ = Describe("LogCache", func() {
 })
 
 func ingressClient(addr string) (client rpc.IngressClient, cleanup func()) {
-	conn, err := grpc.Dial(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
+	conn, err := grpc.NewClient(addr, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
 		panic(err)
 	}
diff --git a/src/internal/gateway/gateway.go b/src/internal/gateway/gateway.go
index 544adf7bc..c4cc8afb5 100644
--- a/src/internal/gateway/gateway.go
+++ b/src/internal/gateway/gateway.go
@@ -81,7 +81,7 @@ func WithGatewayLogCacheDialOpts(opts ...grpc.DialOption) GatewayOption {
 	}
 }
 
-// WithGatewayLogCacheDialOpts returns a GatewayOption that the log-cache
+// WithGatewayVersion returns a GatewayOption that sets the log-cache
 // version returned by the info endpoint.
 func WithGatewayVersion(version string) GatewayOption {
 	return func(g *Gateway) {
@@ -89,8 +89,8 @@ func WithGatewayVersion(version string) GatewayOption {
 	}
 }
 
-// WithGatewayLogCacheDialOpts returns a GatewayOption that the log-cache
-// version returned by the info endpoint.
+// WithGatewayVMUptimeFn returns a GatewayOption that sets the VM
+// uptime function.
 func WithGatewayVMUptimeFn(uptimeFn func() int64) GatewayOption {
 	return func(g *Gateway) {
 		g.uptimeFn = uptimeFn
@@ -136,7 +136,7 @@ func (g *Gateway) listenAndServe() {
 		runtime.WithErrorHandler(g.httpErrorHandler),
 	)
 
-	conn, err := grpc.Dial(g.logCacheAddr, g.logCacheDialOpts...)
+	conn, err := grpc.NewClient(g.logCacheAddr, g.logCacheDialOpts...)
 	if err != nil {
 		g.log.Fatalf("failed to dial Log Cache: %s", err)
 	}
diff --git a/src/internal/nozzle/nozzle.go b/src/internal/nozzle/nozzle.go
index ffedf1418..24c6ffe24 100644
--- a/src/internal/nozzle/nozzle.go
+++ b/src/internal/nozzle/nozzle.go
@@ -100,7 +100,7 @@ func WithSelectors(selectors ...string) NozzleOption {
 func (n *Nozzle) Start() {
 	rx := n.s.Stream(context.Background(), n.buildBatchReq())
 
-	conn, err := grpc.Dial(n.addr, n.opts...)
+	conn, err := grpc.NewClient(n.addr, n.opts...)
 	if err != nil {
 		log.Fatalf("failed to dial %s: %s", n.addr, err)
 	}