diff --git a/hub_test.go b/hub_test.go
index be410d8..ef1bb6b 100644
--- a/hub_test.go
+++ b/hub_test.go
@@ -537,30 +537,22 @@ func processSessionRequest(t *testing.T, w http.ResponseWriter, r *http.Request,
 	return response
 }
 
-var pingRequests map[*testing.T][]*BackendClientRequest
+var (
+	pingRequests testStorage[[]*BackendClientRequest]
+)
 
 func getPingRequests(t *testing.T) []*BackendClientRequest {
-	return pingRequests[t]
+	entries, _ := pingRequests.Get(t)
+	return entries
 }
 
 func clearPingRequests(t *testing.T) {
-	delete(pingRequests, t)
+	pingRequests.Del(t)
 }
 
 func storePingRequest(t *testing.T, request *BackendClientRequest) {
-	if entries, found := pingRequests[t]; !found {
-		if pingRequests == nil {
-			pingRequests = make(map[*testing.T][]*BackendClientRequest)
-		}
-		pingRequests[t] = []*BackendClientRequest{
-			request,
-		}
-		t.Cleanup(func() {
-			clearPingRequests(t)
-		})
-	} else {
-		pingRequests[t] = append(entries, request)
-	}
+	entries, _ := pingRequests.Get(t)
+	pingRequests.Set(t, append(entries, request))
 }
 
 func processPingRequest(t *testing.T, w http.ResponseWriter, r *http.Request, request *BackendClientRequest) *BackendClientResponse {
diff --git a/testutils_test.go b/testutils_test.go
index e18146d..0addf6d 100644
--- a/testutils_test.go
+++ b/testutils_test.go
@@ -196,3 +196,8 @@ func (s *testStorage[T]) Get(t *testing.T) (T, bool) {
 	var defaultValue T
 	return defaultValue, false
 }
+
+func (s *testStorage[T]) Del(t *testing.T) {
+	key := t.Name()
+	s.cleanup(key)
+}