diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 328109b8..4fb0ca96 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -372,323 +372,323 @@
     },
     {
       "ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/apps/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/apps/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/apps/v1beta2",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/authentication/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/authentication/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/authorization/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/authorization/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/autoscaling/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/autoscaling/v2beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/batch/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/batch/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/batch/v2alpha1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/certificates/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/core/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/extensions/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/networking/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/policy/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1alpha1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/rbac/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/scheduling/v1alpha1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/settings/v1alpha1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/storage/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/api/storage/v1beta1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "43f9bc20869f96399b84f4f5e1bea50bc2c2eb48"
+      "Rev": "730e5c0ee7923870b8bdde4eb3129da428be1d83"
     },
     {
       "ImportPath": "k8s.io/kube-openapi/pkg/common",
diff --git a/tools/cache/reflector.go b/tools/cache/reflector.go
index b4865a64..a97b5f98 100644
--- a/tools/cache/reflector.go
+++ b/tools/cache/reflector.go
@@ -295,6 +295,13 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error {
 	}()
 
 	for {
+		// give the stopCh a chance to stop the loop, even in case of continue statements further down on errors
+		select {
+		case <-stopCh:
+			return nil
+		default:
+		}
+
 		timemoutseconds := int64(minWatchTimeout.Seconds() * (rand.Float64() + 1.0))
 		options = metav1.ListOptions{
 			ResourceVersion: resourceVersion,