diff --git a/zenoh-jni/Cargo.lock b/zenoh-jni/Cargo.lock
index 67ebc15e..fb335457 100644
--- a/zenoh-jni/Cargo.lock
+++ b/zenoh-jni/Cargo.lock
@@ -1306,6 +1306,15 @@ version = "0.4.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
 
+[[package]]
+name = "lru"
+version = "0.16.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f"
+dependencies = [
+ "hashbrown 0.16.1",
+]
+
 [[package]]
 name = "lru-slab"
 version = "0.1.2"
@@ -3788,7 +3797,7 @@ dependencies = [
 [[package]]
 name = "zenoh"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "ahash",
  "arc-swap",
@@ -3838,7 +3847,7 @@ dependencies = [
 [[package]]
 name = "zenoh-buffers"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "zenoh-collections",
 ]
@@ -3846,7 +3855,7 @@ dependencies = [
 [[package]]
 name = "zenoh-codec"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "tracing",
  "uhlc",
@@ -3857,7 +3866,7 @@ dependencies = [
 [[package]]
 name = "zenoh-collections"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "ahash",
 ]
@@ -3865,7 +3874,7 @@ dependencies = [
 [[package]]
 name = "zenoh-config"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "json5",
  "nonempty-collections",
@@ -3890,7 +3899,7 @@ dependencies = [
 [[package]]
 name = "zenoh-core"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "lazy_static",
  "tokio",
@@ -3901,7 +3910,7 @@ dependencies = [
 [[package]]
 name = "zenoh-crypto"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "aes",
  "hmac",
@@ -3914,15 +3923,16 @@ dependencies = [
 [[package]]
 name = "zenoh-ext"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
- "async-trait",
  "bincode",
  "flume 0.11.1",
  "futures",
  "leb128",
+ "lru",
  "serde",
  "tokio",
+ "tokio-util",
  "tracing",
  "uhlc",
  "zenoh",
@@ -3933,7 +3943,7 @@ dependencies = [
 [[package]]
 name = "zenoh-keyexpr"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "getrandom 0.2.17",
  "hashbrown 0.16.1",
@@ -3948,7 +3958,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "zenoh-config",
  "zenoh-link-commons",
@@ -3966,7 +3976,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-commons"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "base64",
@@ -4002,7 +4012,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "rustls-webpki",
@@ -4018,7 +4028,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-quic_datagram"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "rustls-webpki",
@@ -4034,7 +4044,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tcp"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "socket2 0.5.10",
@@ -4051,7 +4061,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-tls"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "base64",
@@ -4080,7 +4090,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-udp"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "libc",
@@ -4102,7 +4112,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-unixsock_stream"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "nix",
@@ -4120,7 +4130,7 @@ dependencies = [
 [[package]]
 name = "zenoh-link-ws"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "futures-util",
@@ -4140,7 +4150,7 @@ dependencies = [
 [[package]]
 name = "zenoh-macros"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4151,7 +4161,7 @@ dependencies = [
 [[package]]
 name = "zenoh-plugin-trait"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "git-version",
  "libloading",
@@ -4168,7 +4178,7 @@ dependencies = [
 [[package]]
 name = "zenoh-protocol"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "const_format",
  "rand 0.8.5",
@@ -4183,7 +4193,7 @@ dependencies = [
 [[package]]
 name = "zenoh-result"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "anyhow",
 ]
@@ -4191,7 +4201,7 @@ dependencies = [
 [[package]]
 name = "zenoh-runtime"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "lazy_static",
  "ron",
@@ -4205,7 +4215,7 @@ dependencies = [
 [[package]]
 name = "zenoh-sync"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "arc-swap",
  "event-listener",
@@ -4219,7 +4229,7 @@ dependencies = [
 [[package]]
 name = "zenoh-task"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "futures",
  "tokio",
@@ -4232,7 +4242,7 @@ dependencies = [
 [[package]]
 name = "zenoh-transport"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "crossbeam-utils",
@@ -4266,7 +4276,7 @@ dependencies = [
 [[package]]
 name = "zenoh-util"
 version = "1.9.0"
-source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6685f8471ab5a95b67ed7fdab9c9d9e2022b3102"
+source = "git+https://github.com/eclipse-zenoh/zenoh.git?branch=main#6095d9c824a4c77950d5072d9f52836c63353a10"
 dependencies = [
  "async-trait",
  "const_format",