diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Context.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Context.java
index e5fbaad68e..f47deb9734 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Context.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Context.java
@@ -46,6 +46,13 @@ default <R> Stream<R> getSecondaryResourcesAsStream(Class<R> expectedType) {
   /** ExecutorService initialized by framework for workflows. Used for workflow standalone mode. */
   ExecutorService getWorkflowExecutorService();
 
+  /**
+   * Retrieves the primary resource.
+   *
+   * @return the primary resource associated with the current reconciliation
+   */
+  P getPrimaryResource();
+
   /**
    * Retrieves the primary resource cache.
    *
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java
index b5ea66f8bc..2acf8d13ca 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java
@@ -44,18 +44,6 @@ public <T> Set<T> getSecondaryResources(Class<T> expectedType) {
     return getSecondaryResourcesAsStream(expectedType).collect(Collectors.toSet());
   }
 
-  @Override
-  public IndexedResourceCache<P> getPrimaryCache() {
-    return controller.getEventSourceManager().getControllerEventSource();
-  }
-
-  @Override
-  public boolean isNextReconciliationImminent() {
-    return controller
-        .getEventProcessor()
-        .isNextReconciliationImminent(ResourceID.fromResource(primaryResource));
-  }
-
   @Override
   public <R> Stream<R> getSecondaryResourcesAsStream(Class<R> expectedType) {
     return controller.getEventSourceManager().getEventSourcesFor(expectedType).stream()
@@ -114,12 +102,25 @@ public ExecutorService getWorkflowExecutorService() {
     return controller.getExecutorServiceManager().workflowExecutorService();
   }
 
+  @Override
+  public P getPrimaryResource() {
+    return primaryResource;
+  }
+
+  @Override
+  public IndexedResourceCache<P> getPrimaryCache() {
+    return controller.getEventSourceManager().getControllerEventSource();
+  }
+
+  @Override
+  public boolean isNextReconciliationImminent() {
+    return controller
+        .getEventProcessor()
+        .isNextReconciliationImminent(ResourceID.fromResource(primaryResource));
+  }
+
   public DefaultContext<P> setRetryInfo(RetryInfo retryInfo) {
     this.retryInfo = retryInfo;
     return this;
   }
-
-  public P getPrimaryResource() {
-    return primaryResource;
-  }
 }
diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java
index 8fb9a30ae9..3156ea8b71 100644
--- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java
+++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java
@@ -180,10 +180,8 @@ private PostExecutionControl<P> reconcileExecution(
     return createPostExecutionControl(updatedCustomResource, updateControl);
   }
 
-  @SuppressWarnings("unchecked")
   private PostExecutionControl<P> handleErrorStatusHandler(
       P resource, P originalResource, Context<P> context, Exception e) throws Exception {
-
     RetryInfo retryInfo =
         context
             .getRetryInfo()
diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContextTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContextTest.java
index 296974c4cd..b289d68b22 100644
--- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContextTest.java
+++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContextTest.java
@@ -9,19 +9,19 @@
 import io.javaoperatorsdk.operator.processing.event.NoEventSourceForClassException;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 class DefaultContextTest {
 
-  Secret primary = new Secret();
-  Controller<Secret> mockController = mock(Controller.class);
+  private final Secret primary = new Secret();
+  private final Controller<Secret> mockController = mock();
 
-  DefaultContext<?> context = new DefaultContext<>(null, mockController, primary);
+  private final DefaultContext<?> context = new DefaultContext<>(null, mockController, primary);
 
   @Test
+  @SuppressWarnings("unchecked")
   void getSecondaryResourceReturnsEmptyOptionalOnNonActivatedDRType() {
     var mockManager = mock(EventSourceManager.class);
     when(mockController.getEventSourceManager()).thenReturn(mockManager);
@@ -30,7 +30,14 @@ void getSecondaryResourceReturnsEmptyOptionalOnNonActivatedDRType() {
         .thenThrow(new NoEventSourceForClassException(ConfigMap.class));
 
     var res = context.getSecondaryResource(ConfigMap.class);
-
     assertThat(res).isEmpty();
   }
+
+  @Test
+  void setRetryInfo() {
+    RetryInfo retryInfo = mock();
+    var newContext = context.setRetryInfo(retryInfo);
+    assertThat(newContext).isSameAs(context);
+    assertThat(newContext.getRetryInfo()).hasValue(retryInfo);
+  }
 }