diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/DefaultRetryHandler.java b/src/main/java/com/rabbitmq/client/impl/recovery/DefaultRetryHandler.java
index 8c9b1df3fd..350eb8fa8f 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/DefaultRetryHandler.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/DefaultRetryHandler.java
@@ -35,10 +35,10 @@
  */
 public class DefaultRetryHandler implements RetryHandler {
 
-    private final BiPredicate<RecordedQueue, Exception> queueRecoveryRetryCondition;
-    private final BiPredicate<RecordedExchange, Exception> exchangeRecoveryRetryCondition;
-    private final BiPredicate<RecordedBinding, Exception> bindingRecoveryRetryCondition;
-    private final BiPredicate<RecordedConsumer, Exception> consumerRecoveryRetryCondition;
+    private final BiPredicate<? super RecordedQueue, Exception> queueRecoveryRetryCondition;
+    private final BiPredicate<? super RecordedExchange, Exception> exchangeRecoveryRetryCondition;
+    private final BiPredicate<? super RecordedBinding, Exception> bindingRecoveryRetryCondition;
+    private final BiPredicate<? super RecordedConsumer, Exception> consumerRecoveryRetryCondition;
 
     private final RetryOperation<?> queueRecoveryRetryOperation;
     private final RetryOperation<?> exchangeRecoveryRetryOperation;
@@ -49,10 +49,10 @@ public class DefaultRetryHandler implements RetryHandler {
 
     private final BackoffPolicy backoffPolicy;
 
-    public DefaultRetryHandler(BiPredicate<RecordedQueue, Exception> queueRecoveryRetryCondition,
-        BiPredicate<RecordedExchange, Exception> exchangeRecoveryRetryCondition,
-        BiPredicate<RecordedBinding, Exception> bindingRecoveryRetryCondition,
-        BiPredicate<RecordedConsumer, Exception> consumerRecoveryRetryCondition,
+    public DefaultRetryHandler(BiPredicate<? super RecordedQueue, Exception> queueRecoveryRetryCondition,
+        BiPredicate<? super RecordedExchange, Exception> exchangeRecoveryRetryCondition,
+        BiPredicate<? super RecordedBinding, Exception> bindingRecoveryRetryCondition,
+        BiPredicate<? super RecordedConsumer, Exception> consumerRecoveryRetryCondition,
         RetryOperation<?> queueRecoveryRetryOperation,
         RetryOperation<?> exchangeRecoveryRetryOperation,
         RetryOperation<?> bindingRecoveryRetryOperation,
@@ -72,27 +72,31 @@ public DefaultRetryHandler(BiPredicate<RecordedQueue, Exception> queueRecoveryRe
         this.retryAttempts = retryAttempts;
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public RetryResult retryQueueRecovery(RetryContext context) throws Exception {
-        return doRetry(queueRecoveryRetryCondition, queueRecoveryRetryOperation, context.queue(), context);
+        return doRetry((BiPredicate<RecordedEntity, Exception>) queueRecoveryRetryCondition, queueRecoveryRetryOperation, context.queue(), context);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public RetryResult retryExchangeRecovery(RetryContext context) throws Exception {
-        return doRetry(exchangeRecoveryRetryCondition, exchangeRecoveryRetryOperation, context.exchange(), context);
+        return doRetry((BiPredicate<RecordedEntity, Exception>) exchangeRecoveryRetryCondition, exchangeRecoveryRetryOperation, context.exchange(), context);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public RetryResult retryBindingRecovery(RetryContext context) throws Exception {
-        return doRetry(bindingRecoveryRetryCondition, bindingRecoveryRetryOperation, context.binding(), context);
+        return doRetry((BiPredicate<RecordedEntity, Exception>) bindingRecoveryRetryCondition, bindingRecoveryRetryOperation, context.binding(), context);
     }
 
+    @SuppressWarnings("unchecked")
     @Override
     public RetryResult retryConsumerRecovery(RetryContext context) throws Exception {
-        return doRetry(consumerRecoveryRetryCondition, consumerRecoveryRetryOperation, context.consumer(), context);
+        return doRetry((BiPredicate<RecordedEntity, Exception>) consumerRecoveryRetryCondition, consumerRecoveryRetryOperation, context.consumer(), context);
     }
 
-    protected <T extends RecordedEntity> RetryResult doRetry(BiPredicate<T, Exception> condition, RetryOperation<?> operation, T entity, RetryContext context)
+    protected RetryResult doRetry(BiPredicate<RecordedEntity, Exception> condition, RetryOperation<?> operation, RecordedEntity entity, RetryContext context)
         throws Exception {
         int attempts = 0;
         Exception exception = context.exception();
@@ -107,7 +111,6 @@ protected <T extends RecordedEntity> RetryResult doRetry(BiPredicate<T, Exceptio
                 } catch (Exception e) {
                     exception = e;
                     attempts++;
-                    continue;
                 }
             } else {
                 throw exception;
diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryHandlerBuilder.java b/src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryHandlerBuilder.java
index 9ef35677df..887a494bc5 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryHandlerBuilder.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryHandlerBuilder.java
@@ -30,10 +30,10 @@
  */
 public class TopologyRecoveryRetryHandlerBuilder {
 
-    private BiPredicate<RecordedQueue, Exception> queueRecoveryRetryCondition = (q, e) -> false;
-    private BiPredicate<RecordedExchange, Exception> exchangeRecoveryRetryCondition = (ex, e) -> false;
-    private BiPredicate<RecordedBinding, Exception> bindingRecoveryRetryCondition = (b, e) -> false;
-    private BiPredicate<RecordedConsumer, Exception> consumerRecoveryRetryCondition = (c, e) -> false;
+    private BiPredicate<? super RecordedQueue, Exception> queueRecoveryRetryCondition = (q, e) -> false;
+    private BiPredicate<? super RecordedExchange, Exception> exchangeRecoveryRetryCondition = (ex, e) -> false;
+    private BiPredicate<? super RecordedBinding, Exception> bindingRecoveryRetryCondition = (b, e) -> false;
+    private BiPredicate<? super RecordedConsumer, Exception> consumerRecoveryRetryCondition = (c, e) -> false;
 
     private DefaultRetryHandler.RetryOperation<?> queueRecoveryRetryOperation = context -> null;
     private DefaultRetryHandler.RetryOperation<?> exchangeRecoveryRetryOperation = context -> null;
@@ -50,25 +50,25 @@ public static TopologyRecoveryRetryHandlerBuilder builder() {
     }
 
     public TopologyRecoveryRetryHandlerBuilder queueRecoveryRetryCondition(
-        BiPredicate<RecordedQueue, Exception> queueRecoveryRetryCondition) {
+        BiPredicate<? super RecordedQueue, Exception> queueRecoveryRetryCondition) {
         this.queueRecoveryRetryCondition = queueRecoveryRetryCondition;
         return this;
     }
 
     public TopologyRecoveryRetryHandlerBuilder exchangeRecoveryRetryCondition(
-        BiPredicate<RecordedExchange, Exception> exchangeRecoveryRetryCondition) {
+        BiPredicate<? super RecordedExchange, Exception> exchangeRecoveryRetryCondition) {
         this.exchangeRecoveryRetryCondition = exchangeRecoveryRetryCondition;
         return this;
     }
 
     public TopologyRecoveryRetryHandlerBuilder bindingRecoveryRetryCondition(
-        BiPredicate<RecordedBinding, Exception> bindingRecoveryRetryCondition) {
+        BiPredicate<? super RecordedBinding, Exception> bindingRecoveryRetryCondition) {
         this.bindingRecoveryRetryCondition = bindingRecoveryRetryCondition;
         return this;
     }
 
     public TopologyRecoveryRetryHandlerBuilder consumerRecoveryRetryCondition(
-        BiPredicate<RecordedConsumer, Exception> consumerRecoveryRetryCondition) {
+        BiPredicate<? super RecordedConsumer, Exception> consumerRecoveryRetryCondition) {
         this.consumerRecoveryRetryCondition = consumerRecoveryRetryCondition;
         return this;
     }
diff --git a/src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryLogic.java b/src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryLogic.java
index 8e6e16a790..582475b702 100644
--- a/src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryLogic.java
+++ b/src/main/java/com/rabbitmq/client/impl/recovery/TopologyRecoveryRetryLogic.java
@@ -18,6 +18,7 @@
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.ShutdownSignalException;
 
+import java.util.function.BiPredicate;
 import java.util.function.Predicate;
 
 /**
@@ -31,9 +32,9 @@
  */
 public abstract class TopologyRecoveryRetryLogic {
 
-    public static final Predicate<Exception> CHANNEL_CLOSED_NOT_FOUND = e -> {
-        if (e.getCause() instanceof ShutdownSignalException) {
-            ShutdownSignalException cause = (ShutdownSignalException) e.getCause();
+    public static final BiPredicate<RecordedEntity, Exception> CHANNEL_CLOSED_NOT_FOUND = (entity, ex) -> {
+        if (ex.getCause() instanceof ShutdownSignalException) {
+            ShutdownSignalException cause = (ShutdownSignalException) ex.getCause();
             if (cause.getReason() instanceof AMQP.Channel.Close) {
                 return ((AMQP.Channel.Close) cause.getReason()).getReplyCode() == 404;
             }
diff --git a/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryRetry.java b/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryRetry.java
index 4f8ab6054a..49819ce8d3 100644
--- a/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryRetry.java
+++ b/src/test/java/com/rabbitmq/client/test/functional/TopologyRecoveryRetry.java
@@ -58,8 +58,8 @@ public void topologyRecoveryRetry() throws Exception {
     protected ConnectionFactory newConnectionFactory() {
         ConnectionFactory connectionFactory = TestUtils.connectionFactory();
         connectionFactory.setTopologyRecoveryRetryHandler(
-            builder().bindingRecoveryRetryCondition((b, e) -> CHANNEL_CLOSED_NOT_FOUND.test(e))
-                .consumerRecoveryRetryCondition((b, e) -> CHANNEL_CLOSED_NOT_FOUND.test(e))
+            builder().bindingRecoveryRetryCondition(CHANNEL_CLOSED_NOT_FOUND)
+                .consumerRecoveryRetryCondition(CHANNEL_CLOSED_NOT_FOUND)
                 .bindingRecoveryRetryOperation(RECOVER_CHANNEL.andThen(RECOVER_BINDING_QUEUE).andThen(RECOVER_BINDING))
                 .consumerRecoveryRetryOperation(RECOVER_CHANNEL.andThen(RECOVER_CONSUMER_QUEUE.andThen(RECOVER_CONSUMER)))
                 .build()