diff --git a/implementation/revapi.json b/implementation/revapi.json
index 4e3bf76ef..e5f00cfe6 100644
--- a/implementation/revapi.json
+++ b/implementation/revapi.json
@@ -21,7 +21,23 @@
     "criticality" : "highlight",
     "minSeverity" : "POTENTIALLY_BREAKING",
     "minCriticality" : "documented",
-    "differences" : [ ]
+    "differences" : [
+      {
+        "ignore": true,
+        "code": "java.class.nowFinal",
+        "old": "class io.smallrye.mutiny.converters.uni.UniToMultiPublisher<T>",
+        "new": "class io.smallrye.mutiny.converters.uni.UniToMultiPublisher<T>",
+        "justification": "Internal API optimization"
+      },
+      {
+        "ignore": true,
+        "code": "java.class.nonFinalClassInheritsFromNewClass",
+        "old": "class io.smallrye.mutiny.converters.uni.UniToMultiPublisher<T>",
+        "new": "class io.smallrye.mutiny.converters.uni.UniToMultiPublisher<T>",
+        "superClass": "io.smallrye.mutiny.operators.AbstractMulti<T>",
+        "justification": "Internal API optimization"
+      }
+    ]
   }
 }, {
   "extension" : "revapi.reporter.json",
diff --git a/implementation/src/main/java/io/smallrye/mutiny/converters/uni/UniToMultiPublisher.java b/implementation/src/main/java/io/smallrye/mutiny/converters/uni/UniToMultiPublisher.java
index d8507534c..457a84b35 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/converters/uni/UniToMultiPublisher.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/converters/uni/UniToMultiPublisher.java
@@ -4,16 +4,16 @@
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
 import io.smallrye.mutiny.Uni;
+import io.smallrye.mutiny.operators.AbstractMulti;
 import io.smallrye.mutiny.operators.AbstractUni;
 import io.smallrye.mutiny.subscription.UniSubscriber;
 import io.smallrye.mutiny.subscription.UniSubscription;
 
-public class UniToMultiPublisher<T> implements Publisher<T> {
+public final class UniToMultiPublisher<T> extends AbstractMulti<T> {
 
     private final Uni<T> uni;
 
diff --git a/implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java b/implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java
index e9e1cf51f..54e5ec1a8 100644
--- a/implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java
+++ b/implementation/src/main/java/io/smallrye/mutiny/operators/AbstractUni.java
@@ -118,7 +118,7 @@ public UniConvert<T> convert() {
 
     @Override
     public Multi<T> toMulti() {
-        return Multi.createFrom().safePublisher(new UniToMultiPublisher<>(this));
+        return new UniToMultiPublisher<>(this);
     }
 
     @Override