keycloak-uncached

diff --git a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java
index 986c020..6338ce5 100644
--- a/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java
+++ b/testsuite/integration-arquillian/servers/app-server/app-server-spi/src/main/java/org/keycloak/testsuite/arquillian/container/AppServerContainerService.java
@@ -30,10 +30,10 @@ import org.jboss.shrinkwrap.descriptor.spi.node.Node;
 public class AppServerContainerService  {
 
     private static AppServerContainerService service;
-    private final ServiceLoader<AppServerContainerSPI> loader;
+    private final ServiceLoader<AppServerContainerProvider> loader;
 
     private AppServerContainerService() {
-        loader = ServiceLoader.load(AppServerContainerSPI.class);
+        loader = ServiceLoader.load(AppServerContainerProvider.class);
     }
 
     public static synchronized AppServerContainerService getInstance() {
@@ -46,13 +46,13 @@ public class AppServerContainerService  {
     public List<Node> getContainers(String appServerName) {
         List<Node> containers = null;
         try {
-            Iterator<AppServerContainerSPI> definitions = loader.iterator();
+            Iterator<AppServerContainerProvider> definitions = loader.iterator();
 
-            List<AppServerContainerSPI> availableDefinitions = new ArrayList<>();
+            List<AppServerContainerProvider> availableDefinitions = new ArrayList<>();
             while (definitions != null && definitions.hasNext()) {
                 availableDefinitions.add(definitions.next());
             }
-            for (AppServerContainerSPI def : availableDefinitions) {
+            for (AppServerContainerProvider def : availableDefinitions) {
                 if (def.getName().equals(appServerName)) {
                     containers = def.getContainers();
                 }

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java
index ee9b9ea..e7c02a8 100644
--- a/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/eap/src/main/java/org/keycloak/testsuite/arquillian/eap/container/EAPAppServerProvider.java
@@ -22,12 +22,12 @@ import java.util.List;
 import org.jboss.arquillian.core.spi.Validate;
 import org.jboss.as.arquillian.container.managed.ManagedDeployableContainer;
 import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.keycloak.testsuite.arquillian.container.AppServerContainerSPI;
+import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider;
 
 /**
  * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
  */
-public class EAPAppServerProvider implements AppServerContainerSPI {
+public class EAPAppServerProvider implements AppServerContainerProvider {
 
     private Node configuration;
     private static final String containerName = "eap";
@@ -77,7 +77,7 @@ public class EAPAppServerProvider implements AppServerContainerSPI {
     private Node standaloneContainer() {
         Node container = new Node("container");
         container.attribute("mode", "manual");
-        container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName);
+        container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName);
 
         configuration = container.createChild("configuration");
         createChild("enabled", "true");
@@ -117,7 +117,7 @@ public class EAPAppServerProvider implements AppServerContainerSPI {
 
         Node container = group.createChild("container");
         container.attribute("mode", "manual");
-        container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName + "-ha-node-" + number);
+        container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number);
 
         configuration = container.createChild("configuration");
         createChild("enabled", "true");

diff --git a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java
index a3865cf..46f2e43 100644
--- a/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java
+++ b/testsuite/integration-arquillian/servers/app-server/jboss/wildfly/src/main/java/org/keycloak/testsuite/arquillian/wildfly/container/WildflyAppServerProvider.java
@@ -22,12 +22,12 @@ import java.util.List;
 import org.jboss.arquillian.core.spi.Validate;
 import org.jboss.as.arquillian.container.managed.ManagedDeployableContainer;
 import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.keycloak.testsuite.arquillian.container.AppServerContainerSPI;
+import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider;
 
 /**
  * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
  */
-public class WildflyAppServerProvider implements AppServerContainerSPI {
+public class WildflyAppServerProvider implements AppServerContainerProvider {
 
     private Node configuration;
     private static final String containerName = "wildfly";
@@ -77,7 +77,7 @@ public class WildflyAppServerProvider implements AppServerContainerSPI {
     private Node standaloneContainer() {
         Node container = new Node("container");
         container.attribute("mode", "manual");
-        container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName);
+        container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName);
 
         configuration = container.createChild("configuration");
         createChild("enabled", "true");
@@ -117,7 +117,7 @@ public class WildflyAppServerProvider implements AppServerContainerSPI {
 
         Node container = group.createChild("container");
         container.attribute("mode", "manual");
-        container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName + "-ha-node-" + number);
+        container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number);
 
         configuration = container.createChild("configuration");
         createChild("enabled", "true");

diff --git a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/container/UndertowAppServerProvider.java b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/container/UndertowAppServerProvider.java
index cd60f89..f9af9fe 100644
--- a/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/container/UndertowAppServerProvider.java
+++ b/testsuite/integration-arquillian/servers/app-server/undertow/src/main/java/org/keycloak/testsuite/arquillian/undertow/container/UndertowAppServerProvider.java
@@ -20,13 +20,13 @@ package org.keycloak.testsuite.arquillian.undertow.container;
 import java.util.ArrayList;
 import java.util.List;
 import org.jboss.shrinkwrap.descriptor.spi.node.Node;
-import org.keycloak.testsuite.arquillian.container.AppServerContainerSPI;
 import org.keycloak.testsuite.arquillian.undertow.UndertowAppServer;
+import org.keycloak.testsuite.arquillian.container.AppServerContainerProvider;
 
 /**
  * @author <a href="mailto:vramik@redhat.com">Vlasta Ramik</a>
  */
-public class UndertowAppServerProvider implements AppServerContainerSPI {
+public class UndertowAppServerProvider implements AppServerContainerProvider {
 
     private Node configuration;
     private static final String containerName = "undertow";
@@ -56,7 +56,7 @@ public class UndertowAppServerProvider implements AppServerContainerSPI {
     private Node standaloneContainer() {
         Node container = new Node("container");
         container.attribute("mode", "manual");
-        container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName);
+        container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName);
 
         configuration = container.createChild("configuration");
         createChild("enabled", "true");
@@ -70,7 +70,7 @@ public class UndertowAppServerProvider implements AppServerContainerSPI {
     private Node haNodeContainer(int number) {
         Node container = new Node("container");
         container.attribute("mode", "manual");
-        container.attribute("qualifier", AppServerContainerSPI.APP_SERVER + "-" + containerName + "-ha-node-" + number);
+        container.attribute("qualifier", AppServerContainerProvider.APP_SERVER + "-" + containerName + "-ha-node-" + number);
 
         configuration = container.createChild("configuration");
         createChild("enabled", "true");