diff --git a/docs/content/en/docs/documentation/dependent-resource-and-workflows/dependent-resources.md b/docs/content/en/docs/documentation/dependent-resource-and-workflows/dependent-resources.md
index 8a575f716f..a73d600609 100644
--- a/docs/content/en/docs/documentation/dependent-resource-and-workflows/dependent-resources.md
+++ b/docs/content/en/docs/documentation/dependent-resource-and-workflows/dependent-resources.md
@@ -370,13 +370,13 @@ or we can use a matcher based SSA in most of the cases if the resource is manage
 
 Unfortunately this is not true for external resources. So to make sure we are selecting
 the target resources from an event source, we provide a [mechanism](https://github.com/operator-framework/java-operator-sdk/blob/main/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractExternalDependentResource.java#L114-L138) that helps with that logic.
-Your POJO representing an external resource can implement [`ExternalResourceIDProvider`](https://github.com/operator-framework/java-operator-sdk/blob/main/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/ExternalDependentIDProvider.java) : 
+Your POJO representing an external resource can implement [`ResourceIDProvider`](https://github.com/operator-framework/java-operator-sdk/blob/main/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceIDProvider.java) : 
 
 ```java
 
-public interface ExternalDependentIDProvider<T> {
+public interface ResourceIDProvider<T> {
 
-  T externalResourceId();
+  T resourceId();
 }
 ```
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceIDMapper.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceIDMapper.java
new file mode 100644
index 0000000000..775c99c1ad
--- /dev/null
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceIDMapper.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright Java Operator SDK Authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.javaoperatorsdk.operator.processing;
+
+import io.javaoperatorsdk.operator.processing.event.source.ExternalResourceCachingEventSource;
+
+/** Provides id for the target resource. */
+public interface ResourceIDMapper<R, ID> {
+
+  ID idFor(R resource);
+
+  /**
+   * Can be used if a polling event source handles only single secondary resource and the id is
+   * String. See also docs for: {@link ExternalResourceCachingEventSource}
+   *
+   * @return static id mapper, all resources are mapped for same id.
+   * @param <T> secondary resource type
+   */
+  static <T> ResourceIDMapper<T, String> singleResourceCacheKeyMapper() {
+    return r -> "id";
+  }
+
+  static <T, ID> ResourceIDMapper<T, ID> resourceIdProviderMapper() {
+    return r -> {
+      if (r instanceof ResourceIDProvider resourceIDProvider) {
+        return (ID) resourceIDProvider.resourceId();
+      } else {
+        throw new IllegalStateException(
+            "Resource does not implement ExternalDependentIDProvider: " + r.getClass());
+      }
+    };
+  }
+}
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/ExternalDependentIDProvider.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceIDProvider.java
similarity index 63%
rename from operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/ExternalDependentIDProvider.java
rename to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceIDProvider.java
index b6c755178d..dcab1be92a 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/ExternalDependentIDProvider.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceIDProvider.java
@@ -13,16 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.javaoperatorsdk.operator.processing.dependent;
+package io.javaoperatorsdk.operator.processing;
 
 /**
- * Provides the identifier for an object that represents an external resource. This ID is used to
- * select target resource for a dependent resource from the resources returned by `{@link
- * io.javaoperatorsdk.operator.api.reconciler.Context#getSecondaryResources(Class)}`.
+ * Provides the identifier for an object that represents resource. This ID is used to select target
+ * external resource for a dependent resource from the resources returned by `{@link
+ * io.javaoperatorsdk.operator.api.reconciler.Context#getSecondaryResources(Class)}`. But also for
+ * {@link ResourceIDMapper} for event sources in external resources
  *
  * @param <T>
  */
-public interface ExternalDependentIDProvider<T> {
+public interface ResourceIDProvider<T> {
 
-  T externalResourceId();
+  T resourceId();
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractExternalDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractExternalDependentResource.java
index 2c5be82288..6d0d76e9c5 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractExternalDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractExternalDependentResource.java
@@ -22,19 +22,22 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.RecentOperationCacheFiller;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 
 public abstract class AbstractExternalDependentResource<
-        R, P extends HasMetadata, T extends EventSource<R, P>>
+        R, P extends HasMetadata, T extends EventSource<R, P>, ID>
     extends AbstractEventSourceHolderDependentResource<R, P, T> {
 
   private final boolean isDependentResourceWithExplicitState =
       this instanceof DependentResourceWithExplicitState;
   private final boolean isBulkDependentResource = this instanceof BulkDependentResource;
 
+  protected ResourceIDMapper<R, ID> resourceIDMapper = ResourceIDMapper.resourceIdProviderMapper();
+
   @SuppressWarnings("rawtypes")
   private DependentResourceWithExplicitState dependentResourceWithExplicitState;
 
@@ -131,24 +134,23 @@ protected Optional<R> selectTargetSecondaryResource(
       Set<R> secondaryResources, P primary, Context<P> context) {
     R desired = desired(primary, context);
     List<R> targetResources;
-    if (desired instanceof ExternalDependentIDProvider<?> desiredWithId) {
-      targetResources =
-          secondaryResources.stream()
-              .filter(
-                  r ->
-                      ((ExternalDependentIDProvider<?>) r)
-                          .externalResourceId()
-                          .equals(desiredWithId.externalResourceId()))
-              .toList();
-    } else {
-      throw new IllegalStateException(
-          "Either implement ExternalDependentIDProvider or override this "
-              + " (selectTargetSecondaryResource) method.");
-    }
+    var desiredID = resourceIDMapper.idFor(desired);
+    targetResources =
+        secondaryResources.stream()
+            .filter(r -> resourceIDMapper.idFor(r).equals(desiredID))
+            .toList();
     if (targetResources.size() > 1) {
       throw new IllegalStateException(
           "More than one secondary resource related to primary: " + targetResources);
     }
     return targetResources.isEmpty() ? Optional.empty() : Optional.of(targetResources.get(0));
   }
+
+  public ResourceIDMapper<R, ID> getResourceIDMapper() {
+    return resourceIDMapper;
+  }
+
+  public void setResourceIDMapper(ResourceIDMapper<R, ID> resourceIDMapper) {
+    this.resourceIDMapper = resourceIDMapper;
+  }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractPollingDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractPollingDependentResource.java
index 4b255a35d7..1776194e33 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractPollingDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractPollingDependentResource.java
@@ -20,13 +20,12 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Ignore;
 import io.javaoperatorsdk.operator.processing.dependent.AbstractExternalDependentResource;
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
 import io.javaoperatorsdk.operator.processing.event.source.ExternalResourceCachingEventSource;
 
 @Ignore
-public abstract class AbstractPollingDependentResource<R, P extends HasMetadata>
-    extends AbstractExternalDependentResource<R, P, ExternalResourceCachingEventSource<R, P>>
-    implements CacheKeyMapper<R> {
+public abstract class AbstractPollingDependentResource<R, P extends HasMetadata, ID>
+    extends AbstractExternalDependentResource<
+        R, P, ExternalResourceCachingEventSource<R, P, ID>, ID> {
 
   public static final Duration DEFAULT_POLLING_PERIOD = Duration.ofMillis(5000);
   private Duration pollingPeriod;
@@ -49,10 +48,4 @@ public void setPollingPeriod(Duration pollingPeriod) {
   public Duration getPollingPeriod() {
     return pollingPeriod;
   }
-
-  // for now dependent resources support event sources only with one owned resource.
-  @Override
-  public String keyFor(R resource) {
-    return CacheKeyMapper.singleResourceCacheKeyMapper().keyFor(resource);
-  }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PerResourcePollingDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PerResourcePollingDependentResource.java
index 4df1dcf578..15ac34aa6e 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PerResourcePollingDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PerResourcePollingDependentResource.java
@@ -25,8 +25,8 @@
 import io.javaoperatorsdk.operator.processing.event.source.polling.PerResourcePollingEventSource;
 
 @Ignore
-public abstract class PerResourcePollingDependentResource<R, P extends HasMetadata>
-    extends AbstractPollingDependentResource<R, P>
+public abstract class PerResourcePollingDependentResource<R, P extends HasMetadata, ID>
+    extends AbstractPollingDependentResource<R, P, ID>
     implements PerResourcePollingEventSource.ResourceFetcher<R, P> {
 
   public PerResourcePollingDependentResource() {}
@@ -40,14 +40,14 @@ public PerResourcePollingDependentResource(Class<R> resourceType, Duration polli
   }
 
   @Override
-  protected ExternalResourceCachingEventSource<R, P> createEventSource(
+  protected ExternalResourceCachingEventSource<R, P, ID> createEventSource(
       EventSourceContext<P> context) {
 
     return new PerResourcePollingEventSource<>(
         resourceType(),
         context,
-        new PerResourcePollingConfigurationBuilder<>(this, getPollingPeriod())
-            .withCacheKeyMapper(this)
+        new PerResourcePollingConfigurationBuilder<R, P, ID>(this, getPollingPeriod())
+            .withResourceIDMapper(getResourceIDMapper())
             .withName(name())
             .build());
   }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PollingDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PollingDependentResource.java
index 6b80edc61a..1abeeb1ef2 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PollingDependentResource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/PollingDependentResource.java
@@ -20,34 +20,34 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
 import io.javaoperatorsdk.operator.api.reconciler.Ignore;
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 import io.javaoperatorsdk.operator.processing.event.source.ExternalResourceCachingEventSource;
 import io.javaoperatorsdk.operator.processing.event.source.polling.PollingConfiguration;
 import io.javaoperatorsdk.operator.processing.event.source.polling.PollingEventSource;
 
 @Ignore
-public abstract class PollingDependentResource<R, P extends HasMetadata>
-    extends AbstractPollingDependentResource<R, P>
+public abstract class PollingDependentResource<R, P extends HasMetadata, ID>
+    extends AbstractPollingDependentResource<R, P, ID>
     implements PollingEventSource.GenericResourceFetcher<R> {
 
-  private final CacheKeyMapper<R> cacheKeyMapper;
+  private final ResourceIDMapper<R, ID> resourceIDMapper;
 
-  public PollingDependentResource(Class<R> resourceType, CacheKeyMapper<R> cacheKeyMapper) {
+  public PollingDependentResource(Class<R> resourceType, ResourceIDMapper<R, ID> resourceIDMapper) {
     super(resourceType);
-    this.cacheKeyMapper = cacheKeyMapper;
+    this.resourceIDMapper = resourceIDMapper;
   }
 
   public PollingDependentResource(
-      Class<R> resourceType, Duration pollingPeriod, CacheKeyMapper<R> cacheKeyMapper) {
+      Class<R> resourceType, Duration pollingPeriod, ResourceIDMapper<R, ID> resourceIDMapper) {
     super(resourceType, pollingPeriod);
-    this.cacheKeyMapper = cacheKeyMapper;
+    this.resourceIDMapper = resourceIDMapper;
   }
 
   @Override
-  protected ExternalResourceCachingEventSource<R, P> createEventSource(
+  protected ExternalResourceCachingEventSource<R, P, ID> createEventSource(
       EventSourceContext<P> context) {
     return new PollingEventSource<>(
         resourceType(),
-        new PollingConfiguration<>(name(), this, getPollingPeriod(), cacheKeyMapper));
+        new PollingConfiguration<>(name(), this, getPollingPeriod(), resourceIDMapper));
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CacheKeyMapper.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CacheKeyMapper.java
deleted file mode 100644
index 8038dd1555..0000000000
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/CacheKeyMapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Java Operator SDK Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package io.javaoperatorsdk.operator.processing.event.source;
-
-public interface CacheKeyMapper<R> {
-
-  String keyFor(R resource);
-
-  /**
-   * Used if a polling event source handles only single secondary resource. See also docs for:
-   * {@link ExternalResourceCachingEventSource}
-   *
-   * @return static id mapper, all resources are mapped for same id.
-   * @param <T> secondary resource type
-   */
-  static <T> CacheKeyMapper<T> singleResourceCacheKeyMapper() {
-    return r -> "id";
-  }
-}
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java
index 1c4ce45cb9..259d6e6f0b 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSource.java
@@ -32,6 +32,8 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.RecentOperationCacheFiller;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
+import io.javaoperatorsdk.operator.processing.ResourceIDProvider;
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
@@ -54,25 +56,30 @@
  * @param <R> type of polled external secondary resource
  * @param <P> primary resource
  */
-public abstract class ExternalResourceCachingEventSource<R, P extends HasMetadata>
+public abstract class ExternalResourceCachingEventSource<R, P extends HasMetadata, ID>
     extends AbstractEventSource<R, P> implements RecentOperationCacheFiller<R> {
 
   private static final Logger log =
       LoggerFactory.getLogger(ExternalResourceCachingEventSource.class);
 
-  protected final CacheKeyMapper<R> cacheKeyMapper;
+  protected final ResourceIDMapper<R, ID> resourceIDMapper;
 
-  protected Map<ResourceID, Map<String, R>> cache = new ConcurrentHashMap<>();
+  protected Map<ResourceID, Map<ID, R>> cache = new ConcurrentHashMap<>();
 
   protected ExternalResourceCachingEventSource(
-      Class<R> resourceClass, CacheKeyMapper<R> cacheKeyMapper) {
-    this(null, resourceClass, cacheKeyMapper);
+      Class<R> resourceClass, ResourceIDMapper<R, ID> resourceIDMapper) {
+    this(null, resourceClass, resourceIDMapper);
   }
 
   protected ExternalResourceCachingEventSource(
-      String name, Class<R> resourceClass, CacheKeyMapper<R> cacheKeyMapper) {
+      String name, Class<R> resourceClass, ResourceIDMapper<R, ID> resourceIDMapper) {
     super(resourceClass, name);
-    this.cacheKeyMapper = cacheKeyMapper;
+    if (resourceIDMapper == ResourceIDMapper.resourceIdProviderMapper()
+        && !ResourceIDProvider.class.isAssignableFrom(resourceClass)) {
+      throw new IllegalArgumentException(
+          "resource class is not a " + ResourceIDProvider.class.getSimpleName());
+    }
+    this.resourceIDMapper = resourceIDMapper;
   }
 
   protected synchronized void handleDelete(ResourceID primaryID) {
@@ -84,14 +91,14 @@ protected synchronized void handleDelete(ResourceID primaryID) {
 
   protected synchronized void handleDeletes(ResourceID primaryID, Set<R> resource) {
     handleDelete(
-        primaryID, resource.stream().map(cacheKeyMapper::keyFor).collect(Collectors.toSet()));
+        primaryID, resource.stream().map(resourceIDMapper::idFor).collect(Collectors.toSet()));
   }
 
   protected synchronized void handleDelete(ResourceID primaryID, R resource) {
-    handleDelete(primaryID, Set.of(cacheKeyMapper.keyFor(resource)));
+    handleDelete(primaryID, Set.of(resourceIDMapper.idFor(resource)));
   }
 
-  protected synchronized void handleDelete(ResourceID primaryID, Set<String> resourceIDs) {
+  protected synchronized void handleDelete(ResourceID primaryID, Set<ID> resourceIDs) {
     if (!isRunning()) {
       return;
     }
@@ -137,7 +144,7 @@ protected synchronized void handleResources(
       cachedResources = Collections.emptyMap();
     }
     var newResourcesMap =
-        newResources.stream().collect(Collectors.toMap(cacheKeyMapper::keyFor, r -> r));
+        newResources.stream().collect(Collectors.toMap(resourceIDMapper::idFor, r -> r));
     cache.put(primaryID, newResourcesMap);
     if (propagateEvent
         && !newResourcesMap.equals(cachedResources)
@@ -146,8 +153,7 @@ && acceptedByFiler(cachedResources, newResourcesMap)) {
     }
   }
 
-  private boolean acceptedByFiler(
-      Map<String, R> cachedResourceMap, Map<String, R> newResourcesMap) {
+  private boolean acceptedByFiler(Map<ID, R> cachedResourceMap, Map<ID, R> newResourcesMap) {
 
     var addedResources = new HashMap<>(newResourcesMap);
     addedResources.keySet().removeAll(cachedResourceMap.keySet());
@@ -175,7 +181,7 @@ private boolean acceptedByFiler(
       return true;
     }
 
-    Map<String, R> possibleUpdatedResources = new HashMap<>(cachedResourceMap);
+    Map<ID, R> possibleUpdatedResources = new HashMap<>(cachedResourceMap);
     possibleUpdatedResources.keySet().retainAll(newResourcesMap.keySet());
     possibleUpdatedResources =
         possibleUpdatedResources.entrySet().stream()
@@ -200,7 +206,7 @@ private boolean acceptedByGenericFiler(R resource) {
   @Override
   public synchronized void handleRecentResourceCreate(ResourceID primaryID, R resource) {
     var actualValues = cache.get(primaryID);
-    var resourceId = cacheKeyMapper.keyFor(resource);
+    var resourceId = resourceIDMapper.idFor(resource);
     if (actualValues == null) {
       actualValues = new HashMap<>();
       cache.put(primaryID, actualValues);
@@ -215,7 +221,7 @@ public synchronized void handleRecentResourceUpdate(
       ResourceID primaryID, R resource, R previousVersionOfResource) {
     var actualValues = cache.get(primaryID);
     if (actualValues != null) {
-      var resourceId = cacheKeyMapper.keyFor(resource);
+      var resourceId = resourceIDMapper.idFor(resource);
       R actualResource = actualValues.get(resourceId);
       if (actualResource.equals(previousVersionOfResource)) {
         actualValues.put(resourceId, resource);
@@ -248,7 +254,7 @@ public Optional<R> getSecondaryResource(ResourceID primaryID) {
     }
   }
 
-  public Map<ResourceID, Map<String, R>> getCache() {
+  public Map<ResourceID, Map<ID, R>> getCache() {
     return Collections.unmodifiableMap(cache);
   }
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSource.java
index 6c9e6ec660..44e0a684b6 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSource.java
@@ -21,13 +21,13 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
 import io.javaoperatorsdk.operator.processing.event.source.ExternalResourceCachingEventSource;
 import io.javaoperatorsdk.operator.processing.event.source.ResourceEventAware;
 
-public class CachingInboundEventSource<R, P extends HasMetadata>
-    extends ExternalResourceCachingEventSource<R, P> implements ResourceEventAware<P> {
+public class CachingInboundEventSource<R, P extends HasMetadata, ID>
+    extends ExternalResourceCachingEventSource<R, P, ID> implements ResourceEventAware<P> {
 
   private final ResourceFetcher<R, P> resourceFetcher;
   private final Set<ResourceID> fetchedForPrimaries = ConcurrentHashMap.newKeySet();
@@ -35,8 +35,8 @@ public class CachingInboundEventSource<R, P extends HasMetadata>
   public CachingInboundEventSource(
       ResourceFetcher<R, P> resourceFetcher,
       Class<R> resourceClass,
-      CacheKeyMapper<R> cacheKeyMapper) {
-    super(resourceClass, cacheKeyMapper);
+      ResourceIDMapper<R, ID> resourceIDMapper) {
+    super(resourceClass, resourceIDMapper);
     this.resourceFetcher = resourceFetcher;
   }
 
@@ -48,7 +48,7 @@ public void handleResourceEvent(ResourceID primaryID, R resource) {
     super.handleResources(primaryID, resource);
   }
 
-  public void handleResourceDeleteEvent(ResourceID primaryID, String resourceID) {
+  public void handleResourceDeleteEvent(ResourceID primaryID, ID resourceID) {
     super.handleDelete(primaryID, Set.of(resourceID));
   }
 
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingConfiguration.java
index a66b92cffd..599647ff29 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingConfiguration.java
@@ -22,12 +22,12 @@
 import java.util.function.Predicate;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 
-public record PerResourcePollingConfiguration<R, P extends HasMetadata>(
+public record PerResourcePollingConfiguration<R, P extends HasMetadata, ID>(
     String name,
     ScheduledExecutorService executorService,
-    CacheKeyMapper<R> cacheKeyMapper,
+    ResourceIDMapper<R, ID> resourceIDMapper,
     PerResourcePollingEventSource.ResourceFetcher<R, P> resourceFetcher,
     Predicate<P> registerPredicate,
     Duration defaultPollingPeriod) {
@@ -37,7 +37,7 @@ public record PerResourcePollingConfiguration<R, P extends HasMetadata>(
   public PerResourcePollingConfiguration(
       String name,
       ScheduledExecutorService executorService,
-      CacheKeyMapper<R> cacheKeyMapper,
+      ResourceIDMapper<R, ID> resourceIDMapper,
       PerResourcePollingEventSource.ResourceFetcher<R, P> resourceFetcher,
       Predicate<P> registerPredicate,
       Duration defaultPollingPeriod) {
@@ -46,8 +46,8 @@ public PerResourcePollingConfiguration(
         executorService == null
             ? new ScheduledThreadPoolExecutor(DEFAULT_EXECUTOR_THREAD_NUMBER)
             : executorService;
-    this.cacheKeyMapper =
-        cacheKeyMapper == null ? CacheKeyMapper.singleResourceCacheKeyMapper() : cacheKeyMapper;
+    this.resourceIDMapper =
+        resourceIDMapper == null ? ResourceIDMapper.resourceIdProviderMapper() : resourceIDMapper;
     this.resourceFetcher = Objects.requireNonNull(resourceFetcher);
     this.registerPredicate = registerPredicate;
     this.defaultPollingPeriod = defaultPollingPeriod;
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingConfigurationBuilder.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingConfigurationBuilder.java
index 13a70bd9f2..6fcf5d2678 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingConfigurationBuilder.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingConfigurationBuilder.java
@@ -20,9 +20,9 @@
 import java.util.function.Predicate;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 
-public final class PerResourcePollingConfigurationBuilder<R, P extends HasMetadata> {
+public final class PerResourcePollingConfigurationBuilder<R, P extends HasMetadata, ID> {
 
   private final Duration defaultPollingPeriod;
   private final PerResourcePollingEventSource.ResourceFetcher<R, P> resourceFetcher;
@@ -30,7 +30,7 @@ public final class PerResourcePollingConfigurationBuilder<R, P extends HasMetada
   private String name;
   private Predicate<P> registerPredicate;
   private ScheduledExecutorService executorService;
-  private CacheKeyMapper<R> cacheKeyMapper;
+  private ResourceIDMapper<R, ID> resourceIDMapper;
 
   public PerResourcePollingConfigurationBuilder(
       PerResourcePollingEventSource.ResourceFetcher<R, P> resourceFetcher,
@@ -40,34 +40,34 @@ public PerResourcePollingConfigurationBuilder(
   }
 
   @SuppressWarnings("unused")
-  public PerResourcePollingConfigurationBuilder<R, P> withExecutorService(
+  public PerResourcePollingConfigurationBuilder<R, P, ID> withExecutorService(
       ScheduledExecutorService executorService) {
     this.executorService = executorService;
     return this;
   }
 
-  public PerResourcePollingConfigurationBuilder<R, P> withRegisterPredicate(
+  public PerResourcePollingConfigurationBuilder<R, P, ID> withRegisterPredicate(
       Predicate<P> registerPredicate) {
     this.registerPredicate = registerPredicate;
     return this;
   }
 
-  public PerResourcePollingConfigurationBuilder<R, P> withCacheKeyMapper(
-      CacheKeyMapper<R> cacheKeyMapper) {
-    this.cacheKeyMapper = cacheKeyMapper;
+  public PerResourcePollingConfigurationBuilder<R, P, ID> withResourceIDMapper(
+      ResourceIDMapper<R, ID> resourceIDMapper) {
+    this.resourceIDMapper = resourceIDMapper;
     return this;
   }
 
-  public PerResourcePollingConfigurationBuilder<R, P> withName(String name) {
+  public PerResourcePollingConfigurationBuilder<R, P, ID> withName(String name) {
     this.name = name;
     return this;
   }
 
-  public PerResourcePollingConfiguration<R, P> build() {
+  public PerResourcePollingConfiguration<R, P, ID> build() {
     return new PerResourcePollingConfiguration<>(
         name,
         executorService,
-        cacheKeyMapper,
+        resourceIDMapper,
         resourceFetcher,
         registerPredicate,
         defaultPollingPeriod);
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java
index 2827c0bac0..0f0eb78a69 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSource.java
@@ -48,8 +48,8 @@
  * @param <R> the resource polled by the event source
  * @param <P> related custom resource
  */
-public class PerResourcePollingEventSource<R, P extends HasMetadata>
-    extends ExternalResourceCachingEventSource<R, P> implements ResourceEventAware<P> {
+public class PerResourcePollingEventSource<R, P extends HasMetadata, ID>
+    extends ExternalResourceCachingEventSource<R, P, ID> implements ResourceEventAware<P> {
 
   private static final Logger log = LoggerFactory.getLogger(PerResourcePollingEventSource.class);
 
@@ -65,8 +65,8 @@ public class PerResourcePollingEventSource<R, P extends HasMetadata>
   public PerResourcePollingEventSource(
       Class<R> resourceClass,
       EventSourceContext<P> context,
-      PerResourcePollingConfiguration<R, P> config) {
-    super(config.name(), resourceClass, config.cacheKeyMapper());
+      PerResourcePollingConfiguration<R, P, ID> config) {
+    super(config.name(), resourceClass, config.resourceIDMapper());
     this.primaryResourceCache = context.getPrimaryCache();
     this.resourceFetcher = config.resourceFetcher();
     this.registerPredicate = config.registerPredicate();
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingConfiguration.java
index 56b6261a88..9ac1b8cc96 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingConfiguration.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingConfiguration.java
@@ -18,23 +18,23 @@
 import java.time.Duration;
 import java.util.Objects;
 
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 
-public record PollingConfiguration<R>(
+public record PollingConfiguration<R, ID>(
     String name,
     PollingEventSource.GenericResourceFetcher<R> genericResourceFetcher,
     Duration period,
-    CacheKeyMapper<R> cacheKeyMapper) {
+    ResourceIDMapper<R, ID> resourceIDMapper) {
 
   public PollingConfiguration(
       String name,
       PollingEventSource.GenericResourceFetcher<R> genericResourceFetcher,
       Duration period,
-      CacheKeyMapper<R> cacheKeyMapper) {
+      ResourceIDMapper<R, ID> resourceIDMapper) {
     this.name = name;
     this.genericResourceFetcher = Objects.requireNonNull(genericResourceFetcher);
     this.period = period;
-    this.cacheKeyMapper =
-        cacheKeyMapper == null ? CacheKeyMapper.singleResourceCacheKeyMapper() : cacheKeyMapper;
+    this.resourceIDMapper =
+        resourceIDMapper == null ? ResourceIDMapper.resourceIdProviderMapper() : resourceIDMapper;
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingConfigurationBuilder.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingConfigurationBuilder.java
index 8d922080eb..39c4ce4e54 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingConfigurationBuilder.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingConfigurationBuilder.java
@@ -17,12 +17,12 @@
 
 import java.time.Duration;
 
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 
-public final class PollingConfigurationBuilder<R> {
+public final class PollingConfigurationBuilder<R, ID> {
   private final Duration period;
   private final PollingEventSource.GenericResourceFetcher<R> genericResourceFetcher;
-  private CacheKeyMapper<R> cacheKeyMapper;
+  private ResourceIDMapper<R, ID> resourceIDMapper;
   private String name;
 
   public PollingConfigurationBuilder(
@@ -31,17 +31,18 @@ public PollingConfigurationBuilder(
     this.period = period;
   }
 
-  public PollingConfigurationBuilder<R> withCacheKeyMapper(CacheKeyMapper<R> cacheKeyMapper) {
-    this.cacheKeyMapper = cacheKeyMapper;
+  public PollingConfigurationBuilder<R, ID> withCacheKeyMapper(
+      ResourceIDMapper<R, ID> resourceIDMapper) {
+    this.resourceIDMapper = resourceIDMapper;
     return this;
   }
 
-  public PollingConfigurationBuilder<R> withName(String name) {
+  public PollingConfigurationBuilder<R, ID> withName(String name) {
     this.name = name;
     return this;
   }
 
-  public PollingConfiguration<R> build() {
-    return new PollingConfiguration<>(name, genericResourceFetcher, period, cacheKeyMapper);
+  public PollingConfiguration<R, ID> build() {
+    return new PollingConfiguration<>(name, genericResourceFetcher, period, resourceIDMapper);
   }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java
index 04548e1a11..f5e5a79430 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSource.java
@@ -57,8 +57,8 @@
  * @param <R> type of the polled resource
  * @param <P> primary resource type
  */
-public class PollingEventSource<R, P extends HasMetadata>
-    extends ExternalResourceCachingEventSource<R, P> {
+public class PollingEventSource<R, P extends HasMetadata, ID>
+    extends ExternalResourceCachingEventSource<R, P, ID> {
 
   private static final Logger log = LoggerFactory.getLogger(PollingEventSource.class);
 
@@ -67,8 +67,8 @@ public class PollingEventSource<R, P extends HasMetadata>
   private final Duration period;
   private final AtomicBoolean healthy = new AtomicBoolean(true);
 
-  public PollingEventSource(Class<R> resourceClass, PollingConfiguration<R> config) {
-    super(config.name(), resourceClass, config.cacheKeyMapper());
+  public PollingEventSource(Class<R> resourceClass, PollingConfiguration<R, ID> config) {
+    super(config.name(), resourceClass, config.resourceIDMapper());
     this.genericResourceFetcher = config.genericResourceFetcher();
     this.period = config.period();
   }
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java
index 0fc5495545..889cc4da75 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/ExternalResourceCachingEventSourceTest.java
@@ -30,7 +30,8 @@
 
 class ExternalResourceCachingEventSourceTest
     extends AbstractEventSourceTestBase<
-        ExternalResourceCachingEventSource<SampleExternalResource, HasMetadata>, EventHandler> {
+        ExternalResourceCachingEventSource<SampleExternalResource, HasMetadata, String>,
+        EventHandler> {
 
   @BeforeEach
   public void setup() {
@@ -211,7 +212,7 @@ void genericFilteringEvents() {
   }
 
   public static class TestExternalCachingEventSource
-      extends ExternalResourceCachingEventSource<SampleExternalResource, HasMetadata> {
+      extends ExternalResourceCachingEventSource<SampleExternalResource, HasMetadata, String> {
     public TestExternalCachingEventSource() {
       super(SampleExternalResource.class, SampleExternalResource::getName);
     }
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/SampleExternalResource.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/SampleExternalResource.java
index a6cebc0916..4abac62b2e 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/SampleExternalResource.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/SampleExternalResource.java
@@ -18,9 +18,10 @@
 import java.io.Serializable;
 import java.util.Objects;
 
+import io.javaoperatorsdk.operator.processing.ResourceIDProvider;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
-public class SampleExternalResource implements Serializable {
+public class SampleExternalResource implements Serializable, ResourceIDProvider<String> {
 
   public static final String DEFAULT_VALUE_1 = "value1";
   public static final String DEFAULT_VALUE_2 = "value2";
@@ -81,4 +82,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(name, value);
   }
+
+  @Override
+  public String resourceId() {
+    return name;
+  }
 }
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java
index e468e20561..9356de626b 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/inbound/CachingInboundEventSourceTest.java
@@ -21,10 +21,10 @@
 import org.junit.jupiter.api.Test;
 
 import io.javaoperatorsdk.operator.TestUtils;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 import io.javaoperatorsdk.operator.processing.event.EventHandler;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.AbstractEventSourceTestBase;
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
 import io.javaoperatorsdk.operator.processing.event.source.SampleExternalResource;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 
@@ -39,7 +39,8 @@
 
 class CachingInboundEventSourceTest
     extends AbstractEventSourceTestBase<
-        CachingInboundEventSource<SampleExternalResource, TestCustomResource>, EventHandler> {
+        CachingInboundEventSource<SampleExternalResource, TestCustomResource, String>,
+        EventHandler> {
 
   @SuppressWarnings("unchecked")
   private final CachingInboundEventSource.ResourceFetcher<
@@ -47,7 +48,7 @@ class CachingInboundEventSourceTest
       supplier = mock(CachingInboundEventSource.ResourceFetcher.class);
 
   private final TestCustomResource testCustomResource = TestUtils.testCustomResource();
-  private final CacheKeyMapper<SampleExternalResource> cacheKeyMapper =
+  private final ResourceIDMapper<SampleExternalResource, String> resourceIDMapper =
       r -> r.getName() + "#" + r.getValue();
 
   @BeforeEach
@@ -55,7 +56,7 @@ public void setup() {
     when(supplier.fetchResources(any())).thenReturn(Set.of(SampleExternalResource.testResource1()));
 
     setUpSource(
-        new CachingInboundEventSource<>(supplier, SampleExternalResource.class, cacheKeyMapper));
+        new CachingInboundEventSource<>(supplier, SampleExternalResource.class, resourceIDMapper));
   }
 
   @Test
@@ -89,10 +90,10 @@ void propagateEventOnDeletedResource() throws InterruptedException {
         ResourceID.fromResource(testCustomResource), SampleExternalResource.testResource1());
     source.handleResourceDeleteEvent(
         ResourceID.fromResource(testCustomResource),
-        cacheKeyMapper.keyFor(SampleExternalResource.testResource1()));
+        resourceIDMapper.idFor(SampleExternalResource.testResource1()));
     source.handleResourceDeleteEvent(
         ResourceID.fromResource(testCustomResource),
-        cacheKeyMapper.keyFor(SampleExternalResource.testResource2()));
+        resourceIDMapper.idFor(SampleExternalResource.testResource2()));
 
     verify(eventHandler, times(2)).handleEvent(any());
   }
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java
index cc5958cef4..907ed19fe5 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PerResourcePollingEventSourceTest.java
@@ -25,9 +25,9 @@
 
 import io.javaoperatorsdk.operator.TestUtils;
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 import io.javaoperatorsdk.operator.processing.event.EventHandler;
 import io.javaoperatorsdk.operator.processing.event.source.AbstractEventSourceTestBase;
-import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
 import io.javaoperatorsdk.operator.processing.event.source.IndexerResourceCache;
 import io.javaoperatorsdk.operator.processing.event.source.SampleExternalResource;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
@@ -40,7 +40,8 @@
 
 class PerResourcePollingEventSourceTest
     extends AbstractEventSourceTestBase<
-        PerResourcePollingEventSource<SampleExternalResource, TestCustomResource>, EventHandler> {
+        PerResourcePollingEventSource<SampleExternalResource, TestCustomResource, String>,
+        EventHandler> {
 
   public static final int PERIOD = 150;
 
@@ -66,8 +67,10 @@ public void setup() {
         new PerResourcePollingEventSource<>(
             SampleExternalResource.class,
             context,
-            new PerResourcePollingConfigurationBuilder<>(supplier, Duration.ofMillis(PERIOD))
-                .withCacheKeyMapper(r -> r.getName() + "#" + r.getValue())
+            new PerResourcePollingConfigurationBuilder<
+                    SampleExternalResource, TestCustomResource, String>(
+                    supplier, Duration.ofMillis(PERIOD))
+                .withResourceIDMapper(r -> r.getName() + "#" + r.getValue())
                 .build()));
   }
 
@@ -91,10 +94,12 @@ void registeringTaskOnAPredicate() {
         new PerResourcePollingEventSource<>(
             SampleExternalResource.class,
             context,
-            new PerResourcePollingConfigurationBuilder<>(supplier, Duration.ofMillis(PERIOD))
+            new PerResourcePollingConfigurationBuilder<
+                    SampleExternalResource, TestCustomResource, String>(
+                    supplier, Duration.ofMillis(PERIOD))
                 .withRegisterPredicate(
                     testCustomResource -> testCustomResource.getMetadata().getGeneration() > 1)
-                .withCacheKeyMapper(CacheKeyMapper.singleResourceCacheKeyMapper())
+                .withResourceIDMapper(ResourceIDMapper.resourceIdProviderMapper())
                 .build()));
 
     source.onResourceCreated(testCustomResource);
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java
index 923a4915b9..fbf657ba0b 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/polling/PollingEventSourceTest.java
@@ -37,7 +37,7 @@
 
 class PollingEventSourceTest
     extends AbstractEventSourceTestBase<
-        PollingEventSource<SampleExternalResource, HasMetadata>, EventHandler> {
+        PollingEventSource<SampleExternalResource, HasMetadata, String>, EventHandler> {
 
   public static final int DEFAULT_WAIT_PERIOD = 100;
   public static final Duration POLL_PERIOD = Duration.ofMillis(30L);
@@ -46,7 +46,7 @@ class PollingEventSourceTest
   private final PollingEventSource.GenericResourceFetcher<SampleExternalResource> resourceFetcher =
       mock(PollingEventSource.GenericResourceFetcher.class);
 
-  private final PollingEventSource<SampleExternalResource, HasMetadata> pollingEventSource =
+  private final PollingEventSource<SampleExternalResource, HasMetadata, String> pollingEventSource =
       new PollingEventSource<>(
           SampleExternalResource.class,
           new PollingConfiguration<>(
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java
index c2233d931b..4c6eff7530 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/perresourceeventsource/PerResourcePollingEventSourceTestReconciler.java
@@ -27,6 +27,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
 import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
 import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
+import io.javaoperatorsdk.operator.processing.ResourceIDMapper;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.processing.event.source.polling.PerResourcePollingConfigurationBuilder;
 import io.javaoperatorsdk.operator.processing.event.source.polling.PerResourcePollingEventSource;
@@ -52,19 +53,22 @@ public UpdateControl<PerResourceEventSourceCustomResource> reconcile(
   @Override
   public List<EventSource<?, PerResourceEventSourceCustomResource>> prepareEventSources(
       EventSourceContext<PerResourceEventSourceCustomResource> context) {
-    PerResourcePollingEventSource<String, PerResourceEventSourceCustomResource> eventSource =
-        new PerResourcePollingEventSource<>(
-            String.class,
-            context,
-            new PerResourcePollingConfigurationBuilder<>(
-                    (PerResourceEventSourceCustomResource resource) -> {
-                      numberOfFetchExecutions.putIfAbsent(resource.getMetadata().getName(), 0);
-                      numberOfFetchExecutions.compute(
-                          resource.getMetadata().getName(), (s, v) -> v + 1);
-                      return Set.of(UUID.randomUUID().toString());
-                    },
-                    Duration.ofMillis(POLL_PERIOD))
-                .build());
+    PerResourcePollingEventSource<String, PerResourceEventSourceCustomResource, String>
+        eventSource =
+            new PerResourcePollingEventSource<>(
+                String.class,
+                context,
+                new PerResourcePollingConfigurationBuilder<
+                        String, PerResourceEventSourceCustomResource, String>(
+                        (PerResourceEventSourceCustomResource resource) -> {
+                          numberOfFetchExecutions.putIfAbsent(resource.getMetadata().getName(), 0);
+                          numberOfFetchExecutions.compute(
+                              resource.getMetadata().getName(), (s, v) -> v + 1);
+                          return Set.of(UUID.randomUUID().toString());
+                        },
+                        Duration.ofMillis(POLL_PERIOD))
+                    .withResourceIDMapper(ResourceIDMapper.singleResourceCacheKeyMapper())
+                    .build());
     return List.of(eventSource);
   }
 
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/ExternalBulkDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/ExternalBulkDependentResource.java
index d6f3893674..dda70286d8 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/ExternalBulkDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/ExternalBulkDependentResource.java
@@ -31,7 +31,7 @@
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
 public class ExternalBulkDependentResource
-    extends PollingDependentResource<ExternalResource, BulkDependentTestCustomResource>
+    extends PollingDependentResource<ExternalResource, BulkDependentTestCustomResource, String>
     implements BulkDependentResource<ExternalResource, BulkDependentTestCustomResource>,
         Creator<ExternalResource, BulkDependentTestCustomResource>,
         Deleter<BulkDependentTestCustomResource>,
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/ExternalResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/ExternalResource.java
index fff4f70656..a9fb27e56d 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/ExternalResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/ExternalResource.java
@@ -17,7 +17,9 @@
 
 import java.util.Objects;
 
-public class ExternalResource {
+import io.javaoperatorsdk.operator.processing.ResourceIDProvider;
+
+public class ExternalResource implements ResourceIDProvider<String> {
 
   private final String id;
   private final String data;
@@ -47,4 +49,9 @@ public boolean equals(Object o) {
   public int hashCode() {
     return Objects.hash(id, data);
   }
+
+  @Override
+  public String resourceId() {
+    return id;
+  }
 }
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateReconciler.java
index d1a03b0c8e..de485cfc4e 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateReconciler.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateReconciler.java
@@ -56,7 +56,7 @@ public class ExternalStateReconciler
   private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance();
 
   InformerEventSource<ConfigMap, ExternalStateCustomResource> configMapEventSource;
-  PerResourcePollingEventSource<ExternalResource, ExternalStateCustomResource>
+  PerResourcePollingEventSource<ExternalResource, ExternalStateCustomResource, String>
       externalResourceEventSource;
 
   @Override
@@ -158,10 +158,13 @@ public List<EventSource<?, ExternalStateCustomResource>> prepareEventSources(
               return externalResource.map(Set::of).orElseGet(Collections::emptySet);
             };
     externalResourceEventSource =
-        new PerResourcePollingEventSource<>(
+        new PerResourcePollingEventSource<ExternalResource, ExternalStateCustomResource, String>(
             ExternalResource.class,
             context,
-            new PerResourcePollingConfigurationBuilder<>(fetcher, Duration.ofMillis(300L)).build());
+            new PerResourcePollingConfigurationBuilder<
+                    ExternalResource, ExternalStateCustomResource, String>(
+                    fetcher, Duration.ofMillis(300L))
+                .build());
 
     return Arrays.asList(configMapEventSource, externalResourceEventSource);
   }
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalWithStateDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalWithStateDependentResource.java
index c264ff52c7..e31578a843 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalWithStateDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalWithStateDependentResource.java
@@ -33,7 +33,8 @@
 import io.javaoperatorsdk.operator.support.ExternalResource;
 
 public class ExternalWithStateDependentResource
-    extends PerResourcePollingDependentResource<ExternalResource, ExternalStateCustomResource>
+    extends PerResourcePollingDependentResource<
+        ExternalResource, ExternalStateCustomResource, String>
     implements DependentResourceWithExplicitState<
             ExternalResource, ExternalStateCustomResource, ConfigMap>,
         Updater<ExternalResource, ExternalStateCustomResource> {
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/BulkDependentResourceExternalWithState.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/BulkDependentResourceExternalWithState.java
index 696b02c01e..569e974bff 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/BulkDependentResourceExternalWithState.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/BulkDependentResourceExternalWithState.java
@@ -34,7 +34,7 @@
 
 public class BulkDependentResourceExternalWithState
     extends PerResourcePollingDependentResource<
-        ExternalResource, ExternalStateBulkDependentCustomResource>
+        ExternalResource, ExternalStateBulkDependentCustomResource, String>
     implements BulkDependentResource<ExternalResource, ExternalStateBulkDependentCustomResource>,
         CRUDBulkDependentResource<ExternalResource, ExternalStateBulkDependentCustomResource>,
         DependentResourceWithExplicitState<
@@ -45,6 +45,7 @@ public class BulkDependentResourceExternalWithState
 
   public BulkDependentResourceExternalWithState() {
     super(ExternalResource.class, Duration.ofMillis(300));
+    setResourceIDMapper(this::externalResourceIndex);
   }
 
   @Override
@@ -159,9 +160,4 @@ private String configMapName(
       ExternalStateBulkDependentCustomResource primary, ExternalResource resource) {
     return primary.getMetadata().getName() + DELIMITER + externalResourceIndex(resource);
   }
-
-  @Override
-  public String keyFor(ExternalResource resource) {
-    return externalResourceIndex(resource);
-  }
 }
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/AbstractExternalDependentResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/AbstractExternalDependentResource.java
index 743e6b94f9..7c39a7db9a 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/AbstractExternalDependentResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/AbstractExternalDependentResource.java
@@ -30,7 +30,7 @@
 
 public abstract class AbstractExternalDependentResource
     extends PollingDependentResource<
-        ExternalResource, MultipleManagedExternalDependentResourceCustomResource>
+        ExternalResource, MultipleManagedExternalDependentResourceCustomResource, String>
     implements Creator<ExternalResource, MultipleManagedExternalDependentResourceCustomResource>,
         Updater<ExternalResource, MultipleManagedExternalDependentResourceCustomResource>,
         Deleter<MultipleManagedExternalDependentResourceCustomResource> {
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java
index 9380895105..66939a3c49 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java
@@ -91,11 +91,13 @@ public int getNumberOfExecutions() {
           return res;
         };
 
-    PollingEventSource<ExternalResource, MultipleManagedExternalDependentResourceCustomResource>
+    PollingEventSource<
+            ExternalResource, MultipleManagedExternalDependentResourceCustomResource, String>
         pollingEventSource =
             new PollingEventSource<>(
                 ExternalResource.class,
-                new PollingConfigurationBuilder<>(fetcher, Duration.ofMillis(1000L))
+                new PollingConfigurationBuilder<ExternalResource, String>(
+                        fetcher, Duration.ofMillis(1000L))
                     .withName(EVENT_SOURCE_NAME)
                     .withCacheKeyMapper(ExternalResource::getId)
                     .build());
diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java
index f281fe95db..d581f3c624 100644
--- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java
+++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/support/ExternalResource.java
@@ -18,10 +18,10 @@
 import java.util.Objects;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.processing.dependent.ExternalDependentIDProvider;
+import io.javaoperatorsdk.operator.processing.ResourceIDProvider;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
-public class ExternalResource implements ExternalDependentIDProvider<String> {
+public class ExternalResource implements ResourceIDProvider<String> {
 
   public static final String EXTERNAL_RESOURCE_NAME_DELIMITER = "#";
 
@@ -83,7 +83,7 @@ public static String toExternalResourceId(HasMetadata primary) {
   }
 
   @Override
-  public String externalResourceId() {
+  public String resourceId() {
     return id;
   }
 }
diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
index 4c510edee5..6400d312c7 100644
--- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
+++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/dependent/SchemaDependentResource.java
@@ -58,7 +58,7 @@
     with = ResourcePollerConfig.class,
     converter = ResourcePollerConfigConverter.class)
 public class SchemaDependentResource
-    extends PerResourcePollingDependentResource<Schema, MySQLSchema>
+    extends PerResourcePollingDependentResource<Schema, MySQLSchema, String>
     implements ConfiguredDependentResource<ResourcePollerConfig>,
         Creator<Schema, MySQLSchema>,
         Deleter<MySQLSchema> {
diff --git a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java
index baaa829534..a7c001ffe5 100644
--- a/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java
+++ b/sample-operators/mysql-schema/src/main/java/io/javaoperatorsdk/operator/sample/schema/Schema.java
@@ -18,9 +18,9 @@
 import java.io.Serializable;
 import java.util.Objects;
 
-import io.javaoperatorsdk.operator.processing.dependent.ExternalDependentIDProvider;
+import io.javaoperatorsdk.operator.processing.ResourceIDProvider;
 
-public class Schema implements Serializable, ExternalDependentIDProvider<String> {
+public class Schema implements Serializable, ResourceIDProvider<String> {
 
   private final String name;
   private final String characterSet;
@@ -57,7 +57,7 @@ public String toString() {
   }
 
   @Override
-  public String externalResourceId() {
+  public String resourceId() {
     return name;
   }
 }