diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 540474e2..265c7fbd 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -396,207 +396,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "085ff9770270458ad7d899f2338e193c2c585d5b"
+			"Rev": "cd53e6e3b3a5f792de51f8d95fb17f46f0627abf"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/discovery/round_tripper.go b/discovery/round_tripper.go
index a195d2a2..75b7f520 100644
--- a/discovery/round_tripper.go
+++ b/discovery/round_tripper.go
@@ -20,6 +20,7 @@ import (
 	"net/http"
 	"path/filepath"
 
+	"github.com/golang/glog"
 	"github.com/gregjones/httpcache"
 	"github.com/gregjones/httpcache/diskcache"
 	"github.com/peterbourgon/diskv"
@@ -47,4 +48,15 @@ func (rt *cacheRoundTripper) RoundTrip(req *http.Request) (*http.Response, error
 	return rt.rt.RoundTrip(req)
 }
 
+func (rt *cacheRoundTripper) CancelRequest(req *http.Request) {
+	type canceler interface {
+		CancelRequest(*http.Request)
+	}
+	if cr, ok := rt.rt.Transport.(canceler); ok {
+		cr.CancelRequest(req)
+	} else {
+		glog.Errorf("CancelRequest not implemented by %T", rt.rt.Transport)
+	}
+}
+
 func (rt *cacheRoundTripper) WrappedRoundTripper() http.RoundTripper { return rt.rt.Transport }