diff --git a/core/src/validator.rs b/core/src/validator.rs
index 718dccc045cf94..b3770fb3ea904e 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -1004,7 +1004,7 @@ impl Validator {
         let staked_nodes = Arc::new(RwLock::new(StakedNodes::default()));
 
         // ConnectionCache might be used for JsonRpc and for Forwarding. Since
-        // the later is not migrated yet to the tpu-client-next, create
+        // the latter is not migrated yet to the tpu-client-next, create
         // ConnectionCache regardless of config.use_tpu_client_next for now.
         let connection_cache = match use_quic {
             true => {
@@ -1591,10 +1591,9 @@ impl Validator {
         *start_progress.write().unwrap() = ValidatorStartProgress::Running;
         if let Some(client_updater) = client_updater {
             key_notifies.push(client_updater);
-        } else {
-            // add connection_cache because it is still used in Forwarder.
-            key_notifies.push(connection_cache);
         }
+        // add connection_cache because it is still used in Forwarder.
+        key_notifies.push(connection_cache);
 
         *admin_rpc_service_post_init.write().unwrap() = Some(AdminRpcRequestMetadataPostInit {
             bank_forks: bank_forks.clone(),
diff --git a/rpc/src/rpc.rs b/rpc/src/rpc.rs
index 8e3a2dbcf54f2d..180d4e9a08130e 100644
--- a/rpc/src/rpc.rs
+++ b/rpc/src/rpc.rs
@@ -378,6 +378,10 @@ impl JsonRpcRequestProcessor {
         let (sender, receiver) = unbounded();
 
         let client = Client::create_client(runtime, my_tpu_address, None, 1);
+        assert!(
+            client.protocol() == Protocol::QUIC,
+            "UDP is not supported by this test."
+        );
         SendTransactionService::new(&bank_forks, receiver, client, 1000, exit.clone());
 
         let leader_schedule_cache = Arc::new(LeaderScheduleCache::new_from_bank(&bank));
@@ -6523,6 +6527,10 @@ pub mod tests {
             Arc::new(PrioritizationFeeCache::default()),
         );
         let client = C::create_client(maybe_runtime, my_tpu_address, None, 1);
+        assert!(
+            client.protocol() == Protocol::QUIC,
+            "UDP is not supported by this test."
+        );
         SendTransactionService::new(&bank_forks, receiver, client, 1000, exit.clone());
 
         let mut bad_transaction = system_transaction::transfer(
@@ -6794,6 +6802,10 @@ pub mod tests {
             Arc::new(PrioritizationFeeCache::default()),
         );
         let client = C::create_client(maybe_runtime, my_tpu_address, None, 1);
+        assert!(
+            client.protocol() == Protocol::QUIC,
+            "UDP is not supported by this test."
+        );
         SendTransactionService::new(&bank_forks, receiver, client, 1000, exit);
 
         assert_eq!(