diff --git a/pkg/client/factory.go b/pkg/client/factory.go
index 8d393c1..42b0e74 100644
--- a/pkg/client/factory.go
+++ b/pkg/client/factory.go
@@ -50,7 +50,7 @@ func NewFactory(cfg *rest.Config, impersonate bool) (*Factory, error) {
 		}
 	})
 
-	watchClientCfg := rest.CopyConfig(cfg)
+	watchClientCfg := rest.CopyConfig(clientCfg)
 	watchClientCfg.Timeout = 30 * time.Minute
 
 	md, err := metadata.NewForConfig(cfg)
diff --git a/pkg/server/store/proxy/proxy_store.go b/pkg/server/store/proxy/proxy_store.go
index b17a0e6..876abdd 100644
--- a/pkg/server/store/proxy/proxy_store.go
+++ b/pkg/server/store/proxy/proxy_store.go
@@ -71,11 +71,8 @@ func toAPI(schema *types.APISchema, obj runtime.Object) types.APIObject {
 		obj = moveToUnderscore(unstr)
 	}
 
-	gvr := attributes.GVR(schema)
-
-	t := fmt.Sprintf("%s/%s/%s", gvr.Group, gvr.Version, gvr.Resource)
 	apiObject := types.APIObject{
-		Type:   t,
+		Type:   schema.ID,
 		Object: obj,
 	}