diff --git a/runtime/internal/rpc/client.go b/runtime/internal/rpc/client.go
index 3c5d528..aae918d 100644
--- a/runtime/internal/rpc/client.go
+++ b/runtime/internal/rpc/client.go
@@ -136,6 +136,7 @@
 		c.wg.Wait()
 		c.outstanding.close()
 		close(c.closed)
+		c.typeCache.close()
 	}()
 
 	return c
diff --git a/runtime/internal/rpc/server.go b/runtime/internal/rpc/server.go
index 907bd96..f694f16 100644
--- a/runtime/internal/rpc/server.go
+++ b/runtime/internal/rpc/server.go
@@ -268,6 +268,7 @@
 		s.state = rpc.ServerStopped
 		s.Unlock()
 		close(s.closed)
+		s.typeCache.close()
 	}()
 	return s.ctx, s, nil
 }
diff --git a/runtime/internal/rpc/typecache.go b/runtime/internal/rpc/typecache.go
index 1911543..318b4d1 100644
--- a/runtime/internal/rpc/typecache.go
+++ b/runtime/internal/rpc/typecache.go
@@ -119,3 +119,18 @@
 		tc.mu.Unlock()
 	}
 }
+
+func (tc *typeCache) close() {
+	tc.mu.Lock()
+	for _, tce := range tc.flows {
+		if tce != nil {
+			if tce.cancel != nil {
+				tce.cancel()
+			}
+			if tce.dec != nil {
+				tce.dec.Stop()
+			}
+		}
+	}
+	tc.mu.Unlock()
+}