diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index cd17dfad..bdf1c191 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "k8s.io/client-go",
-	"GoVersion": "go1.10",
+	"GoVersion": "go1.9",
 	"GodepVersion": "v80",
 	"Packages": [
 		"./..."
@@ -388,203 +388,203 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "783dfbe86ff74ef4a6e1243688e1585ac243f8e7"
+			"Rev": "5cb97f8dd690761fe10c1a33b79196c54bc3a965"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/discovery/cached/memcache.go b/discovery/cached/memcache.go
index d4313bcf..a6ebbe4f 100644
--- a/discovery/cached/memcache.go
+++ b/discovery/cached/memcache.go
@@ -67,20 +67,7 @@ func (d *memCacheClient) ServerResourcesForGroupVersion(groupVersion string) (*m
 
 // ServerResources returns the supported resources for all groups and versions.
 func (d *memCacheClient) ServerResources() ([]*metav1.APIResourceList, error) {
-	apiGroups, err := d.ServerGroups()
-	if err != nil {
-		return nil, err
-	}
-	groupVersions := metav1.ExtractGroupVersions(apiGroups)
-	result := []*metav1.APIResourceList{}
-	for _, groupVersion := range groupVersions {
-		resources, err := d.ServerResourcesForGroupVersion(groupVersion)
-		if err != nil {
-			return nil, err
-		}
-		result = append(result, resources)
-	}
-	return result, nil
+	return discovery.ServerResources(d)
 }
 
 func (d *memCacheClient) ServerGroups() (*metav1.APIGroupList, error) {