diff --git a/core/src/main/java/org/eclipse/hono/util/CommandRouterConstants.java b/core/src/main/java/org/eclipse/hono/util/CommandRouterConstants.java
index 3e4457e96a..0e6bf970c2 100644
--- a/core/src/main/java/org/eclipse/hono/util/CommandRouterConstants.java
+++ b/core/src/main/java/org/eclipse/hono/util/CommandRouterConstants.java
@@ -19,6 +19,12 @@
 
 public final class CommandRouterConstants extends RequestResponseApiConstants {
 
+    /**
+     * The default name of the (remote) cache in the data grid that is used for
+     * storing command router information.
+     */
+    public static final String DEFAULT_CACHE_NAME = "command-router";
+
     /**
      * The name of the Command Router API endpoint.
      */
diff --git a/services/command-router/src/main/java/org/eclipse/hono/commandrouter/ApplicationConfig.java b/services/command-router/src/main/java/org/eclipse/hono/commandrouter/ApplicationConfig.java
index f56cce2711..33abe4583c 100644
--- a/services/command-router/src/main/java/org/eclipse/hono/commandrouter/ApplicationConfig.java
+++ b/services/command-router/src/main/java/org/eclipse/hono/commandrouter/ApplicationConfig.java
@@ -44,6 +44,7 @@
 import org.eclipse.hono.service.deviceconnection.DeviceConnectionService;
 import org.eclipse.hono.service.metric.MetricsTags;
 import org.eclipse.hono.util.CommandConstants;
+import org.eclipse.hono.util.CommandRouterConstants;
 import org.eclipse.hono.util.Constants;
 import org.eclipse.hono.util.RegistrationConstants;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -241,7 +242,9 @@ public CacheBasedDeviceConnectionInfo deviceConnectionInfo(final BasicCache<Stri
     @Bean
     @ConfigurationProperties(prefix = "hono.command-router.cache.common")
     public CommonCacheConfig deviceConnectionInfoCommonCacheConfig() {
-        return new CommonCacheConfig();
+        final CommonCacheConfig commonCacheConfig = new CommonCacheConfig();
+        commonCacheConfig.setCacheName(CommandRouterConstants.DEFAULT_CACHE_NAME);
+        return commonCacheConfig;
     }
 
     /**
diff --git a/tests/src/test/resources/commandrouter/cache-config.xml b/tests/src/test/resources/commandrouter/cache-config.xml
index f491df8edb..df5f50718f 100644
--- a/tests/src/test/resources/commandrouter/cache-config.xml
+++ b/tests/src/test/resources/commandrouter/cache-config.xml
@@ -11,8 +11,8 @@
     SPDX-License-Identifier: EPL-2.0
  -->
 <infinispan>
-  <cache-container default-cache="device-connection">
-    <local-cache name="device-connection" simple-cache="true">
+  <cache-container default-cache="command-router">
+    <local-cache name="command-router" simple-cache="true">
       <memory>
         <object size="100" strategy="REMOVE" />
       </memory>