diff --git a/go.mod b/go.mod
index 8a02b55ae5..c03eb7b657 100644
--- a/go.mod
+++ b/go.mod
@@ -60,6 +60,9 @@ replace (
 	// controller runtime
 	github.com/openshift/api => github.com/openshift/api v0.0.0-20200331152225-585af27e34fd // release-4.5
 	github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
+	// Patch for a race condition involving metadata-only
+	// informers until it can be resolved upstream:
+	sigs.k8s.io/controller-runtime v0.9.2 => github.com/benluddy/controller-runtime v0.9.3-0.20210720171926-9bcb99bd9bd3
 
 	// pinned because no tag supports 1.18 yet
 	sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
diff --git a/go.sum b/go.sum
index 6a43a12331..f0a51b880f 100644
--- a/go.sum
+++ b/go.sum
@@ -133,6 +133,8 @@ github.com/aws/aws-sdk-go v1.17.7/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN
 github.com/aws/aws-sdk-go v1.27.0/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g=
 github.com/benbjohnson/clock v1.0.3/go.mod h1:bGMdMPoPVvcYyt1gHDf4J2KE153Yf9BuiUKYMaxlTDM=
+github.com/benluddy/controller-runtime v0.9.3-0.20210720171926-9bcb99bd9bd3 h1:XnmeUOSdoo764dm67j2pKUNU7MqzB6a303w4ML2EhB4=
+github.com/benluddy/controller-runtime v0.9.3-0.20210720171926-9bcb99bd9bd3/go.mod h1:TxzMCHyEUpaeuOiZx/bIdc2T81vfs/aKdvJt9wuu0zk=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
@@ -1724,8 +1726,6 @@ sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.20 h1:jLWvYcn/9pCws
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.20/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/controller-runtime v0.8.0/go.mod h1:v9Lbj5oX443uR7GXYY46E0EE2o7k2YxQ58GxVNeXSW4=
 sigs.k8s.io/controller-runtime v0.9.0/go.mod h1:TgkfvrhhEw3PlI0BRL/5xM+89y3/yc0ZDfdbTl84si8=
-sigs.k8s.io/controller-runtime v0.9.2 h1:MnCAsopQno6+hI9SgJHKddzXpmv2wtouZz6931Eax+Q=
-sigs.k8s.io/controller-runtime v0.9.2/go.mod h1:TxzMCHyEUpaeuOiZx/bIdc2T81vfs/aKdvJt9wuu0zk=
 sigs.k8s.io/controller-tools v0.4.1/go.mod h1:G9rHdZMVlBDocIxGkK3jHLWqcTMNvveypYJwrvYKjWU=
 sigs.k8s.io/controller-tools v0.6.0/go.mod h1:baRMVPrctU77F+rfAuH2uPqW93k6yQnZA2dhUOr7ihc=
 sigs.k8s.io/controller-tools v0.6.1 h1:nODRx2YrSNcaGd+90+CVC9SGEG6ygHlz3nSJmweR5as=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index aa0d1d11c9..501145b967 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1589,7 +1589,7 @@ k8s.io/utils/trace
 # sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.20
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
-# sigs.k8s.io/controller-runtime v0.9.2
+# sigs.k8s.io/controller-runtime v0.9.2 => github.com/benluddy/controller-runtime v0.9.3-0.20210720171926-9bcb99bd9bd3
 ## explicit
 sigs.k8s.io/controller-runtime
 sigs.k8s.io/controller-runtime/pkg/builder
diff --git a/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/metadata_infomer_wrapper.go b/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/metadata_infomer_wrapper.go
index c0fa24a5c1..af35d95b9c 100644
--- a/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/metadata_infomer_wrapper.go
+++ b/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/metadata_infomer_wrapper.go
@@ -19,6 +19,7 @@ package internal
 import (
 	"time"
 
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/tools/cache"
 )
@@ -48,24 +49,39 @@ type handlerPreserveGVK struct {
 	cache.ResourceEventHandler
 }
 
-func (h *handlerPreserveGVK) resetGroupVersionKind(obj interface{}) {
-	if v, ok := obj.(schema.ObjectKind); ok {
-		v.SetGroupVersionKind(h.gvk)
+func (h *handlerPreserveGVK) copyWithGVK(obj interface{}) interface{} {
+	switch t := obj.(type) {
+	case *metav1.PartialObjectMetadata:
+		return &metav1.PartialObjectMetadata{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: h.gvk.GroupVersion().String(),
+				Kind:       h.gvk.Kind,
+			},
+			ObjectMeta: t.ObjectMeta,
+		}
+	case *metav1.PartialObjectMetadataList:
+		return &metav1.PartialObjectMetadataList{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: h.gvk.GroupVersion().String(),
+				Kind:       h.gvk.Kind,
+			},
+			ListMeta: t.ListMeta,
+			Items:    t.Items,
+		}
+	default:
+		return obj
 	}
+
 }
 
 func (h *handlerPreserveGVK) OnAdd(obj interface{}) {
-	h.resetGroupVersionKind(obj)
-	h.ResourceEventHandler.OnAdd(obj)
+	h.ResourceEventHandler.OnAdd(h.copyWithGVK(obj))
 }
 
 func (h *handlerPreserveGVK) OnUpdate(oldObj, newObj interface{}) {
-	h.resetGroupVersionKind(oldObj)
-	h.resetGroupVersionKind(newObj)
-	h.ResourceEventHandler.OnUpdate(oldObj, newObj)
+	h.ResourceEventHandler.OnUpdate(h.copyWithGVK(oldObj), h.copyWithGVK(newObj))
 }
 
 func (h *handlerPreserveGVK) OnDelete(obj interface{}) {
-	h.resetGroupVersionKind(obj)
-	h.ResourceEventHandler.OnDelete(obj)
+	h.ResourceEventHandler.OnDelete(h.copyWithGVK(obj))
 }