diff --git a/mux.go b/mux.go
index ce795870..48c4d1e1 100644
--- a/mux.go
+++ b/mux.go
@@ -445,13 +445,13 @@ func CurrentRoute(r *http.Request) *Route {
 	return nil
 }
 
-func requestWithVars(r *http.Request, val interface{}) *http.Request {
-	ctx := context.WithValue(r.Context(), varsKey, val)
+func requestWithVars(r *http.Request, vars map[string]string) *http.Request {
+	ctx := context.WithValue(r.Context(), varsKey, vars)
 	return r.WithContext(ctx)
 }
 
-func requestWithRoute(r *http.Request, val interface{}) *http.Request {
-	ctx := context.WithValue(r.Context(), routeKey, val)
+func requestWithRoute(r *http.Request, route *Route) *http.Request {
+	ctx := context.WithValue(r.Context(), routeKey, route)
 	return r.WithContext(ctx)
 }