keycloak-uncached

diff --git a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java
index d61a611..52c1309 100755
--- a/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java
+++ b/model/infinispan/src/main/java/org/keycloak/models/cache/infinispan/RealmCacheSession.java
@@ -616,7 +616,7 @@ public class RealmCacheSession implements CacheRealmProvider {
 
     @Override
     public RoleModel addRealmRole(RealmModel realm, String id, String name) {
-        RoleModel role = getDelegate().addRealmRole(realm, name);
+        RoleModel role = getDelegate().addRealmRole(realm, id, name);
         addedRole(role.getId(), realm.getId());
         return role;
     }

diff --git a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
index 5d5b343..fa30e65 100755
--- a/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
+++ b/testsuite/integration-arquillian/tests/base/src/test/java/org/keycloak/testsuite/exportimport/ExportImportTest.java
@@ -179,6 +179,9 @@ public class ExportImportTest extends AbstractExportImportTest {
 
         List<ComponentRepresentation> components = adminClient.realm("test").components().query();
         KeysMetadataRepresentation keyMetadata = adminClient.realm("test").keys().getKeyMetadata();
+        String sampleRealmRoleId = adminClient.realm("test").roles().get("sample-realm-role").toRepresentation().getId();
+        String testAppId = adminClient.realm("test").clients().findByClientId("test-app").get(0).getId();
+        String sampleClientRoleId = adminClient.realm("test").clients().get(testAppId).roles().get("sample-client-role").toRepresentation().getId();
 
         // Delete some realm (and some data in admin realm)
         adminClient.realm("test").remove();
@@ -208,6 +211,12 @@ public class ExportImportTest extends AbstractExportImportTest {
 
         KeysMetadataRepresentation keyMetadataImported = adminClient.realm("test").keys().getKeyMetadata();
         assertEquals(keyMetadata.getActive(), keyMetadataImported.getActive());
+
+        String importedSampleRealmRoleId = adminClient.realm("test").roles().get("sample-realm-role").toRepresentation().getId();
+        assertEquals(sampleRealmRoleId, importedSampleRealmRoleId);
+
+        String importedSampleClientRoleId = adminClient.realm("test").clients().get(testAppId).roles().get("sample-client-role").toRepresentation().getId();
+        assertEquals(sampleClientRoleId, importedSampleClientRoleId);
     }
 
     private void assertAuthenticated(String realmName, String username, String password) {