diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 9622ab51..bd7f4d50 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -168,7 +168,7 @@
 		},
 		{
 			"ImportPath": "github.com/modern-go/reflect2",
-			"Rev": "05fbef0ca5da472bbf96c9322b84a53edc03c9fd"
+			"Rev": "94122c33edd36123c84d5368cfb2b69df93a0ec8"
 		},
 		{
 			"ImportPath": "github.com/peterbourgon/diskv",
@@ -272,335 +272,335 @@
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta2",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/coordination/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "0d2438381651a1fe2816a9ac1923eeefa129e254"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "7619dea5b21b9d40430236f2d21ce583150d579c"
+			"Rev": "b90fb3933738446b5a2196f37f3a8d24cbc5eb93"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/vendor/github.com/modern-go/reflect2/.travis.yml b/vendor/github.com/modern-go/reflect2/.travis.yml
index 449e67cd..fbb43744 100644
--- a/vendor/github.com/modern-go/reflect2/.travis.yml
+++ b/vendor/github.com/modern-go/reflect2/.travis.yml
@@ -6,6 +6,7 @@ go:
 
 before_install:
   - go get -t -v ./...
+  - go get -t -v github.com/modern-go/reflect2-tests/...
 
 script:
   - ./test.sh
diff --git a/vendor/github.com/modern-go/reflect2/Gopkg.toml b/vendor/github.com/modern-go/reflect2/Gopkg.toml
index 3593fd04..2f4f4dbd 100644
--- a/vendor/github.com/modern-go/reflect2/Gopkg.toml
+++ b/vendor/github.com/modern-go/reflect2/Gopkg.toml
@@ -24,7 +24,7 @@
 #   go-tests = true
 #   unused-packages = true
 
-ignored = ["github.com/modern-go/test","github.com/modern-go/test/must","github.com/modern-go/test/should"]
+ignored = []
 
 [[constraint]]
   name = "github.com/modern-go/concurrent"
diff --git a/vendor/github.com/modern-go/reflect2/reflect2.go b/vendor/github.com/modern-go/reflect2/reflect2.go
index 0632b71f..63b49c79 100644
--- a/vendor/github.com/modern-go/reflect2/reflect2.go
+++ b/vendor/github.com/modern-go/reflect2/reflect2.go
@@ -150,6 +150,9 @@ func (cfg *frozenConfig) TypeOf(obj interface{}) Type {
 }
 
 func (cfg *frozenConfig) Type2(type1 reflect.Type) Type {
+	if type1 == nil {
+		return nil
+	}
 	cacheKey := uintptr(unpackEFace(type1).data)
 	typeObj, found := cfg.cache.Load(cacheKey)
 	if found {
diff --git a/vendor/github.com/modern-go/reflect2/test.sh b/vendor/github.com/modern-go/reflect2/test.sh
index fbcef730..3d2b9768 100755
--- a/vendor/github.com/modern-go/reflect2/test.sh
+++ b/vendor/github.com/modern-go/reflect2/test.sh
@@ -3,7 +3,7 @@
 set -e
 echo "" > coverage.txt
 
-for d in $(go list ./... | grep -v vendor); do
+for d in $(go list github.com/modern-go/reflect2-tests/... | grep -v vendor); do
     go test -coverprofile=profile.out -coverpkg=github.com/modern-go/reflect2 $d
     if [ -f profile.out ]; then
         cat profile.out >> coverage.txt
diff --git a/vendor/github.com/modern-go/reflect2/type_map.go b/vendor/github.com/modern-go/reflect2/type_map.go
index 6d489112..3acfb558 100644
--- a/vendor/github.com/modern-go/reflect2/type_map.go
+++ b/vendor/github.com/modern-go/reflect2/type_map.go
@@ -4,6 +4,7 @@ import (
 	"reflect"
 	"runtime"
 	"strings"
+	"sync"
 	"unsafe"
 )
 
@@ -15,10 +16,17 @@ func typelinks1() [][]unsafe.Pointer
 //go:linkname typelinks2 reflect.typelinks
 func typelinks2() (sections []unsafe.Pointer, offset [][]int32)
 
-var types = map[string]reflect.Type{}
-var packages = map[string]map[string]reflect.Type{}
+// initOnce guards initialization of types and packages
+var initOnce sync.Once
+
+var types map[string]reflect.Type
+var packages map[string]map[string]reflect.Type
+
+// discoverTypes initializes types and packages
+func discoverTypes() {
+	types = make(map[string]reflect.Type)
+	packages = make(map[string]map[string]reflect.Type)
 
-func init() {
 	ver := runtime.Version()
 	if ver == "go1.5" || strings.HasPrefix(ver, "go1.5.") {
 		loadGo15Types()
@@ -90,11 +98,13 @@ type emptyInterface struct {
 
 // TypeByName return the type by its name, just like Class.forName in java
 func TypeByName(typeName string) Type {
+	initOnce.Do(discoverTypes)
 	return Type2(types[typeName])
 }
 
 // TypeByPackageName return the type by its package and name
 func TypeByPackageName(pkgPath string, name string) Type {
+	initOnce.Do(discoverTypes)
 	pkgTypes := packages[pkgPath]
 	if pkgTypes == nil {
 		return nil