diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 969c410a..2989653e 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -456,195 +456,195 @@
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "d62cf72a0abe0cce52774b5136fb672a1f37f70e"
+      "Rev": "2dc2b12394600198a0176dc967d31ab73a65d74f"
     },
     {
       "ImportPath": "k8s.io/kube-openapi/pkg/common",
diff --git a/tools/cache/reflector.go b/tools/cache/reflector.go
index d0cb2dd1..4967f98d 100644
--- a/tools/cache/reflector.go
+++ b/tools/cache/reflector.go
@@ -239,8 +239,6 @@ func (r *Reflector) resyncChan() (<-chan time.Time, func() bool) {
 func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error {
 	glog.V(3).Infof("Listing and watching %v from %s", r.expectedType, r.name)
 	var resourceVersion string
-	resyncCh, cleanup := r.resyncChan()
-	defer cleanup()
 
 	// Explicitly set "0" as resource version - it's fine for the List()
 	// to be served from cache and potentially be delayed relative to
@@ -272,6 +270,10 @@ func (r *Reflector) ListAndWatch(stopCh <-chan struct{}) error {
 	cancelCh := make(chan struct{})
 	defer close(cancelCh)
 	go func() {
+		resyncCh, cleanup := r.resyncChan()
+		defer func() {
+			cleanup() // Call the last one written into cleanup
+		}()
 		for {
 			select {
 			case <-resyncCh: