diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/ContextualDataStorage.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/ContextualDataStorage.java
deleted file mode 100644
index bcbfdf5f0..000000000
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/ContextualDataStorage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Hibernate, Relational Persistence for Idiomatic Java
- *
- * SPDX-License-Identifier: Apache-2.0
- * Copyright: Red Hat Inc. and Hibernate Authors
- */
-package org.hibernate.reactive.context.impl;
-
-import org.hibernate.reactive.context.Context;
-
-import io.vertx.core.impl.ContextInternal;
-import io.vertx.core.spi.context.storage.AccessMode;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import io.vertx.core.impl.VertxBuilder;
-import io.vertx.core.spi.VertxServiceProvider;
-import io.vertx.core.spi.context.storage.ContextLocal;
-
-/**
- * SPI Implementation for {@link ContextLocal} storage.
- */
-public class ContextualDataStorage implements VertxServiceProvider {
-
-	@SuppressWarnings("rawtypes")
-	private final static ContextLocal<ConcurrentMap> CONTEXTUAL_DATA_KEY = ContextLocal.registerLocal( ConcurrentMap.class );
-
-	@Override
-	public void init(VertxBuilder vertxBuilder) {
-	}
-
-	@SuppressWarnings({ "unchecked" })
-	public static <T> Map<Context.Key<T>, T> contextualDataMap(ContextInternal vertxContext) {
-		return vertxContext.getLocal(
-				ContextualDataStorage.CONTEXTUAL_DATA_KEY,
-				AccessMode.CONCURRENT,
-				ConcurrentHashMap::new
-		);
-	}
-}
diff --git a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/VertxContext.java b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/VertxContext.java
index 24975a87f..4448c9b6c 100644
--- a/hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/VertxContext.java
+++ b/hibernate-reactive-core/src/main/java/org/hibernate/reactive/context/impl/VertxContext.java
@@ -17,8 +17,6 @@
 import org.hibernate.service.spi.ServiceRegistryAwareService;
 import org.hibernate.service.spi.ServiceRegistryImplementor;
 
-import static org.hibernate.reactive.context.impl.ContextualDataStorage.contextualDataMap;
-
 /**
  * An adaptor for the Vert.x {@link io.vertx.core.Context}.
  *
@@ -38,10 +36,10 @@ public void injectServices(ServiceRegistryImplementor serviceRegistry) {
 
 	@Override
 	public <T> void put(Key<T> key, T instance) {
-		final ContextInternal context = ContextInternal.current();
+		final io.vertx.core.Context context = Vertx.currentContext();
 		if ( context != null ) {
 			if ( trace ) LOG.tracef( "Putting key,value in context: [%1$s, %2$s]", key, instance );
-			ContextualDataStorage.<T>contextualDataMap( context ).put( key, instance );
+			context.putLocal( key, instance );
 		}
 		else {
 			if ( trace ) LOG.tracef( "Context is null for key,value: [%1$s, %2$s]", key, instance  );
@@ -51,9 +49,9 @@ public <T> void put(Key<T> key, T instance) {
 
 	@Override
 	public <T> T get(Key<T> key) {
-		final ContextInternal context = ContextInternal.current();
+		final io.vertx.core.Context context = Vertx.currentContext();
 		if ( context != null ) {
-			T local = ContextualDataStorage.<T>contextualDataMap( context ).get( key );
+			T local = context.getLocal( key );
 			if ( trace ) LOG.tracef( "Getting value %2$s from context for key %1$s", key, local  );
 			return local;
 		}
@@ -65,9 +63,9 @@ public <T> T get(Key<T> key) {
 
 	@Override
 	public void remove(Key<?> key) {
-		final ContextInternal context = ContextInternal.current();
+		final io.vertx.core.Context context = Vertx.currentContext();
 		if ( context != null ) {
-			boolean removed = contextualDataMap( context ).remove( key ) != null;
+			boolean removed = context.removeLocal( key );
 			if ( trace ) LOG.tracef( "Key %s removed from context: %s", key, removed );
 		}
 		else {
@@ -93,4 +91,5 @@ public void execute(Runnable runnable) {
 			runnable.run();
 		}
 	}
+
 }
diff --git a/hibernate-reactive-core/src/main/resources/META-INF/services/io.vertx.core.spi.VertxServiceProvider b/hibernate-reactive-core/src/main/resources/META-INF/services/io.vertx.core.spi.VertxServiceProvider
deleted file mode 100644
index 80ffcb31c..000000000
--- a/hibernate-reactive-core/src/main/resources/META-INF/services/io.vertx.core.spi.VertxServiceProvider
+++ /dev/null
@@ -1 +0,0 @@
-org.hibernate.reactive.context.impl.ContextualDataStorage
\ No newline at end of file