diff --git a/client/request.go b/client/request.go
index 80a03b09..daa7e60b 100644
--- a/client/request.go
+++ b/client/request.go
@@ -298,11 +298,12 @@ func (r *Request) Cookie(key string) string {
 // Use maps.Collect() to gather them into a map if needed.
 func (r *Request) Cookies() iter.Seq2[string, string] {
 	return func(yield func(string, string) bool) {
-		r.cookies.VisitAll(func(key, val string) {
-			if !yield(key, val) {
+		for k, v := range *r.cookies {
+			res := yield(k, v)
+			if !res {
 				return
 			}
-		})
+		}
 	}
 }
 
@@ -343,11 +344,11 @@ func (r *Request) PathParam(key string) string {
 // Use maps.Collect() to gather them into a map if needed.
 func (r *Request) PathParams() iter.Seq2[string, string] {
 	return func(yield func(string, string) bool) {
-		r.path.VisitAll(func(key, val string) {
-			if !yield(key, val) {
+		for k, v := range *r.path {
+			if !yield(k, v) {
 				return
 			}
-		})
+		}
 	}
 }
 
diff --git a/client/request_test.go b/client/request_test.go
index c13dbbd8..73bae29d 100644
--- a/client/request_test.go
+++ b/client/request_test.go
@@ -1,3 +1,4 @@
+//nolint:goconst // Much easier to just ignore memory leaks in tests
 package client
 
 import (
@@ -451,6 +452,14 @@ func Test_Request_Cookies(t *testing.T) {
 	require.Equal(t, "bar", cookies["foo"])
 	require.Equal(t, "foo", cookies["bar"])
 
+	require.NotPanics(t, func() {
+		for _, v := range req.Cookies() {
+			if v == "bar" {
+				break
+			}
+		}
+	})
+
 	require.Len(t, cookies, 2)
 }
 
@@ -564,6 +573,14 @@ func Test_Request_PathParams(t *testing.T) {
 	require.Equal(t, "foo", pathParams["bar"])
 
 	require.Len(t, pathParams, 2)
+
+	require.NotPanics(t, func() {
+		for _, v := range req.PathParams() {
+			if v == "bar" {
+				break
+			}
+		}
+	})
 }
 
 func Benchmark_Request_PathParams(b *testing.B) {
@@ -1579,7 +1596,7 @@ func Test_SetValWithStruct(t *testing.T) {
 
 		require.True(t, func() bool {
 			for _, v := range p.PeekMulti("TSlice") {
-				if string(v) == "bar" { //nolint:goconst // test
+				if string(v) == "bar" {
 					return true
 				}
 			}