diff --git a/pom.xml b/pom.xml
index d01b8e8c79..e1d8f618fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 
         <maven.build.sourceVersion>11</maven.build.sourceVersion>
 
-        <dependency.alfresco-data-model.version>8.112</dependency.alfresco-data-model.version>
+        <dependency.alfresco-data-model.version>8.113</dependency.alfresco-data-model.version>
         <dependency.alfresco-core.version>8.33</dependency.alfresco-core.version>
 
         <dependency.alfresco-legacy-lucene.version>6.2</dependency.alfresco-legacy-lucene.version>
diff --git a/src/main/resources/alfresco/authentication-services-context.xml b/src/main/resources/alfresco/authentication-services-context.xml
index 6aeaa86987..36c9a22bd4 100644
--- a/src/main/resources/alfresco/authentication-services-context.xml
+++ b/src/main/resources/alfresco/authentication-services-context.xml
@@ -598,8 +598,8 @@
                 <property name="ticketsCache">
                     <ref bean="ticketsCache" />
                 </property>
-                <property name="usernameKey">
-                    <ref bean="usernameKeyCache" />
+                <property name="usernameToTicketIdCache">
+                    <ref bean="usernameToTicketIdCache" />
                 </property>
                 <!-- The period for which tickets are valid in XML duration format. -->
                 <!-- The default is PT1H for one hour. -->
diff --git a/src/main/resources/alfresco/cache-context.xml b/src/main/resources/alfresco/cache-context.xml
index 091fb721c4..24e2500fcb 100644
--- a/src/main/resources/alfresco/cache-context.xml
+++ b/src/main/resources/alfresco/cache-context.xml
@@ -281,8 +281,8 @@
       <constructor-arg value="cache.ticketsCache"/>
    </bean>
 
-    <bean name="usernameKeyCache" factory-bean="cacheFactory" factory-method="createCache">
-        <constructor-arg value="cache.usernameKeyCache"/>
+    <bean name="usernameToTicketIdCache" factory-bean="cacheFactory" factory-method="createCache">
+        <constructor-arg value="cache.usernameToTicketIdCache"/>
     </bean>
       
    <!-- ===================================== -->
diff --git a/src/main/resources/alfresco/caches.properties b/src/main/resources/alfresco/caches.properties
index 0b68415ccc..5e4ae5f249 100644
--- a/src/main/resources/alfresco/caches.properties
+++ b/src/main/resources/alfresco/caches.properties
@@ -333,14 +333,14 @@ cache.ticketsCache.eviction-policy=LRU
 cache.ticketsCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy
 cache.ticketsCache.readBackupData=false
 
-cache.usernameKeyCache.maxItems=1000
-cache.usernameKeyCache.timeToLiveSeconds=0
-cache.usernameKeyCache.maxIdleSeconds=0
-cache.usernameKeyCache.cluster.type=fully-distributed
-cache.usernameKeyCache.backup-count=1
-cache.usernameKeyCache.eviction-policy=LRU
-cache.usernameKeyCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy
-cache.usernameKeyCache.readBackupData=false
+cache.usernameToTicketIdCache.maxItems=1000
+cache.usernameToTicketIdCache.timeToLiveSeconds=0
+cache.usernameToTicketIdCache.maxIdleSeconds=0
+cache.usernameToTicketIdCache.cluster.type=fully-distributed
+cache.usernameToTicketIdCache.backup-count=1
+cache.usernameToTicketIdCache.eviction-policy=LRU
+cache.usernameToTicketIdCache.merge-policy=com.hazelcast.map.merge.PutIfAbsentMapMergePolicy
+cache.usernameToTicketIdCache.readBackupData=false
 
 cache.authorityEntitySharedCache.tx.maxItems=50000
 cache.authorityEntitySharedCache.tx.statsEnabled=${caches.tx.statsEnabled}
diff --git a/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java b/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
index b8b5914259..bb7ec8aa15 100644
--- a/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
+++ b/src/test/java/org/alfresco/repo/security/authentication/AuthenticationTest.java
@@ -54,7 +54,6 @@ import org.alfresco.model.ContentModel;
 import org.alfresco.repo.admin.SysAdminParamsImpl;
 import org.alfresco.repo.cache.SimpleCache;
 import org.alfresco.repo.domain.dialect.Dialect;
-import org.alfresco.repo.domain.dialect.PostgreSQLDialect;
 import org.alfresco.repo.management.subsystems.ChildApplicationContextFactory;
 import org.alfresco.repo.management.subsystems.ChildApplicationContextManager;
 import org.alfresco.repo.policy.BehaviourFilter;
@@ -103,7 +102,7 @@ public class AuthenticationTest extends TestCase
     private AuthenticationManager authenticationManager;
     private TicketComponent ticketComponent;
     private SimpleCache<String, Ticket> ticketsCache;
-    private SimpleCache<String, String> usernameKey;
+    private SimpleCache<String, String> usernameToTicketIdCache;
     private MutableAuthenticationService authenticationService;
     private MutableAuthenticationService pubAuthenticationService;
     private AuthenticationComponent authenticationComponent;
@@ -174,7 +173,7 @@ public class AuthenticationTest extends TestCase
         // permissionServiceSPI = (PermissionServiceSPI)
         // ctx.getBean("permissionService");
         ticketsCache = (SimpleCache<String, Ticket>) ctx.getBean("ticketsCache");
-        usernameKey = (SimpleCache<String, String>) ctx.getBean("usernameKeyCache");
+        usernameToTicketIdCache = (SimpleCache<String, String>) ctx.getBean("usernameToTicketIdCache");
 
         ChildApplicationContextFactory sysAdminSubsystem = (ChildApplicationContextFactory) ctx.getBean("sysAdmin");
         assertNotNull("sysAdminSubsystem", sysAdminSubsystem);
@@ -831,7 +830,7 @@ public class AuthenticationTest extends TestCase
         tc.setTicketsExpire(false);
         tc.setValidDuration("P0D");
         tc.setTicketsCache(ticketsCache);
-        tc.setUsernameKey(usernameKey);
+        tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
 
         dao.createUser("Andy", "ticket".toCharArray());
 
@@ -858,7 +857,7 @@ public class AuthenticationTest extends TestCase
         tc.setTicketsExpire(false);
         tc.setValidDuration("P0D");
         tc.setTicketsCache(ticketsCache);
-        tc.setUsernameKey(usernameKey);
+        tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
 
         dao.createUser("Andy", "ticket".toCharArray());
 
@@ -888,14 +887,14 @@ public class AuthenticationTest extends TestCase
     public void testTicketExpiryMode()
     {   
         ticketsCache.clear();
-        usernameKey.clear();
+        usernameToTicketIdCache.clear();
         
         InMemoryTicketComponentImpl tc = new InMemoryTicketComponentImpl();
         tc.setOneOff(false);
         tc.setTicketsExpire(true);
         tc.setValidDuration("P5S");
         tc.setTicketsCache(ticketsCache);
-        tc.setUsernameKey(usernameKey);
+        tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
         tc.setExpiryMode(ExpiryMode.AFTER_FIXED_TIME.toString());
 
         dao.createUser("Andy", "ticket".toCharArray());
@@ -1033,13 +1032,13 @@ public class AuthenticationTest extends TestCase
     public void testTicketExpires()
     {
         ticketsCache.clear();
-        usernameKey.clear();
+        usernameToTicketIdCache.clear();
         InMemoryTicketComponentImpl tc = new InMemoryTicketComponentImpl();
         tc.setOneOff(false);
         tc.setTicketsExpire(true);
         tc.setValidDuration("P5S");
         tc.setTicketsCache(ticketsCache);
-        tc.setUsernameKey(usernameKey);
+        tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
 
         dao.createUser("Andy", "ticket".toCharArray());
 
@@ -1133,7 +1132,7 @@ public class AuthenticationTest extends TestCase
         tc.setTicketsExpire(true);
         tc.setValidDuration("P1D");
         tc.setTicketsCache(ticketsCache);
-        tc.setUsernameKey(usernameKey);
+        tc.setUsernameToTicketIdCache(usernameToTicketIdCache);
 
         dao.createUser("Andy", "ticket".toCharArray());