diff --git a/server-spi/src/main/java/org/keycloak/models/cache/CachedObject.java b/model/legacy/src/main/java/org/keycloak/models/cache/CachedObject.java
similarity index 100%
rename from server-spi/src/main/java/org/keycloak/models/cache/CachedObject.java
rename to model/legacy/src/main/java/org/keycloak/models/cache/CachedObject.java
diff --git a/server-spi/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java b/model/legacy/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java
similarity index 100%
rename from server-spi/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java
rename to model/legacy/src/main/java/org/keycloak/storage/CacheableStorageProviderModel.java