diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 0e065c71..ff83bca6 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -476,199 +476,199 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "4386ce4494bcd2ae3cc96b2f7a1a7fd8277380cc"
+			"Rev": "8f08e92da84286e3923d61d445ec4ff23b432272"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/common",
diff --git a/tools/cache/delta_fifo.go b/tools/cache/delta_fifo.go
index a71db604..f06d1c5b 100644
--- a/tools/cache/delta_fifo.go
+++ b/tools/cache/delta_fifo.go
@@ -539,6 +539,10 @@ func (f *DeltaFIFO) Resync() error {
 	f.lock.Lock()
 	defer f.lock.Unlock()
 
+	if f.knownObjects == nil {
+		return nil
+	}
+
 	keys := f.knownObjects.ListKeys()
 	for _, k := range keys {
 		if err := f.syncKeyLocked(k); err != nil {