diff --git a/go.mod b/go.mod
index a79238c1a..5062b8bde 100644
--- a/go.mod
+++ b/go.mod
@@ -39,9 +39,9 @@ require (
 	github.com/miekg/dns v1.1.40
 	github.com/mitchellh/mapstructure v1.4.1
 	github.com/netfoundry/secretstream v0.1.2
-	github.com/openziti/fabric v0.16.20
-	github.com/openziti/foundation v0.15.34
-	github.com/openziti/sdk-golang v0.15.20
+	github.com/openziti/fabric v0.16.21
+	github.com/openziti/foundation v0.15.35
+	github.com/openziti/sdk-golang v0.15.21
 	github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231
 	github.com/pkg/errors v0.9.1
 	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
diff --git a/go.sum b/go.sum
index 09dd20ac4..dabbbb476 100644
--- a/go.sum
+++ b/go.sum
@@ -495,12 +495,12 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y
 github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
 github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
 github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
-github.com/openziti/fabric v0.16.20 h1:63Rm8SIr8dc575q+cqvsy0A4CjMcNYA2iqefzTHGL6Y=
-github.com/openziti/fabric v0.16.20/go.mod h1:/g6H+zok0pmEi7/zraKfBs1sONykq4WTlWe9+c+aLhM=
-github.com/openziti/foundation v0.15.34 h1:okFeo44my2ZB8Vc2uf/7BkVy63X4b3eRS+IBkklVhow=
-github.com/openziti/foundation v0.15.34/go.mod h1:0vyGpNqnK/WuVhUE1Kfq+UvCWIf/rUYViMrCrCZ2cTc=
-github.com/openziti/sdk-golang v0.15.20 h1:LxjXJdc13xL0cpWeUZ6KdkjAtxKhGGRC3fOmTwOZu5E=
-github.com/openziti/sdk-golang v0.15.20/go.mod h1:0ddE24WVTng/SCOmQTszXvKbzANWQbosJ8pRRarCFLg=
+github.com/openziti/fabric v0.16.21 h1:bRKj094+5cUdx4bF+mF5JbKBS77K0ywNeDhy5PSMSDk=
+github.com/openziti/fabric v0.16.21/go.mod h1:iF5BPXp+MceayRx11hJV885EofqP6f4/xyW5dCupKYQ=
+github.com/openziti/foundation v0.15.35 h1:FYL2TNKqRzXVN70XhU15Nw2OrWnd5Lbz0hz4heVsxqg=
+github.com/openziti/foundation v0.15.35/go.mod h1:0vyGpNqnK/WuVhUE1Kfq+UvCWIf/rUYViMrCrCZ2cTc=
+github.com/openziti/sdk-golang v0.15.21 h1:HeBvSXTSFixV1D8EdioNiO9nvGdqvIsxxx4Rkrs2ZLA=
+github.com/openziti/sdk-golang v0.15.21/go.mod h1:yck2z5JbHb/Ruw3PcB3AMgankYZUwUnL2WQqat120xo=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231 h1:fa50YL1pzKW+1SsBnJDOHppJN9stOEwS+CRWyUtyYGU=
 github.com/orcaman/concurrent-map v0.0.0-20210106121528-16402b402231/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
diff --git a/router/xgress_edge/perf_test.go b/router/xgress_edge/perf_test.go
index 5743d368b..7ff2ad21e 100644
--- a/router/xgress_edge/perf_test.go
+++ b/router/xgress_edge/perf_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/openziti/sdk-golang/ziti/edge"
 	"github.com/stretchr/testify/require"
 	"testing"
-	"time"
 )
 
 type noopMetricsHandler struct{}
@@ -101,7 +100,7 @@ func writePerf(b *testing.B, mux edge.MsgMux) {
 	req := require.New(b)
 	req.NoError(mux.AddMsgSink(conn))
 
-	metricsRegistry := metrics.NewUsageRegistry("test", map[string]string{}, time.Minute, noopMetricsHandler{}, nil)
+	metricsRegistry := metrics.NewUsageRegistry("test", map[string]string{}, nil)
 	xgress.InitMetrics(metricsRegistry)
 
 	fwdOptions := forwarder.DefaultOptions()
@@ -171,7 +170,7 @@ func Benchmark_BaselinePerf(b *testing.B) {
 	}
 	xgOptions := xgress.DefaultOptions()
 
-	metricsRegistry := metrics.NewUsageRegistry("test", map[string]string{}, time.Minute, noopMetricsHandler{}, nil)
+	metricsRegistry := metrics.NewUsageRegistry("test", map[string]string{}, nil)
 	xgress.InitMetrics(metricsRegistry)
 
 	fwdOptions := forwarder.DefaultOptions()