diff --git a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
index b933dd72..8f643fc2 100644
--- a/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
+++ b/daemon/src/main/java/org/apache/maven/cli/DaemonMavenCli.java
@@ -94,10 +94,10 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.util.StringUtils;
 import org.eclipse.aether.transfer.TransferListener;
-import org.mvndaemon.mvnd.cache.impl.CliExtensionRealmCache;
-import org.mvndaemon.mvnd.cache.impl.CliPluginArtifactsCache;
-import org.mvndaemon.mvnd.cache.impl.CliPluginRealmCache;
-import org.mvndaemon.mvnd.cache.impl.CliProjectArtifactsCache;
+import org.mvndaemon.mvnd.cache.invalidating.InvalidatingExtensionRealmCache;
+import org.mvndaemon.mvnd.cache.invalidating.InvalidatingPluginArtifactsCache;
+import org.mvndaemon.mvnd.cache.invalidating.InvalidatingPluginRealmCache;
+import org.mvndaemon.mvnd.cache.invalidating.InvalidatingProjectArtifactsCache;
 import org.mvndaemon.mvnd.common.Environment;
 import org.mvndaemon.mvnd.logging.internal.Slf4jLoggerManager;
 import org.mvndaemon.mvnd.logging.smart.BuildEventListener;
@@ -503,10 +503,10 @@ public class DaemonMavenCli {
             protected void configure() {
                 bind(ILoggerFactory.class).toInstance(slf4jLoggerFactory);
                 bind(CoreExports.class).toInstance(exports);
-                bind(ExtensionRealmCache.class).to(CliExtensionRealmCache.class);
-                bind(PluginArtifactsCache.class).to(CliPluginArtifactsCache.class);
-                bind(PluginRealmCache.class).to(CliPluginRealmCache.class);
-                bind(ProjectArtifactsCache.class).to(CliProjectArtifactsCache.class);
+                bind(ExtensionRealmCache.class).to(InvalidatingExtensionRealmCache.class);
+                bind(PluginArtifactsCache.class).to(InvalidatingPluginArtifactsCache.class);
+                bind(PluginRealmCache.class).to(InvalidatingPluginRealmCache.class);
+                bind(ProjectArtifactsCache.class).to(InvalidatingProjectArtifactsCache.class);
                 bind(MavenPluginManager.class).to(CliMavenPluginManager.class);
             }
         });
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/Cache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/Cache.java
similarity index 98%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/Cache.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/Cache.java
index 28bf8bc4..49f90e41 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/Cache.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/Cache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.factory;
+package org.mvndaemon.mvnd.cache;
 
 import java.util.function.BiPredicate;
 import java.util.function.Function;
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheFactory.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/CacheFactory.java
similarity index 95%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheFactory.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/CacheFactory.java
index 95874ad1..01ffa527 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheFactory.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/CacheFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.factory;
+package org.mvndaemon.mvnd.cache;
 
 /**
  * A factory for cache objects
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheRecord.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/CacheRecord.java
similarity index 96%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheRecord.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/CacheRecord.java
index 83861f75..2cadad50 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/CacheRecord.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/CacheRecord.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.factory;
+package org.mvndaemon.mvnd.cache;
 
 import java.nio.file.Path;
 import java.util.stream.Stream;
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/DefaultCacheFactory.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/DefaultCacheFactory.java
similarity index 87%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/DefaultCacheFactory.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/DefaultCacheFactory.java
index f2c50b8a..1dbaf5c5 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/DefaultCacheFactory.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/DefaultCacheFactory.java
@@ -13,11 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.factory;
+package org.mvndaemon.mvnd.cache.impl;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
 import org.eclipse.sisu.Priority;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheFactory;
+import org.mvndaemon.mvnd.cache.CacheRecord;
 import org.mvndaemon.mvnd.common.Os;
 
 @Named
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/TimestampCacheFactory.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactory.java
similarity index 97%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/TimestampCacheFactory.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactory.java
index 51f9fbf9..83e8f45c 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/TimestampCacheFactory.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.factory;
+package org.mvndaemon.mvnd.cache.impl;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -29,6 +29,9 @@ import java.util.function.BiPredicate;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheFactory;
+import org.mvndaemon.mvnd.cache.CacheRecord;
 
 /**
  * A factory for {@link Cache} objects invalidating its entries based on {@link BasicFileAttributes#lastModifiedTime()}
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/WatchServiceCacheFactory.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/WatchServiceCacheFactory.java
similarity index 98%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/WatchServiceCacheFactory.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/WatchServiceCacheFactory.java
index c2d576d4..f4d4edf7 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/factory/WatchServiceCacheFactory.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/WatchServiceCacheFactory.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.factory;
+package org.mvndaemon.mvnd.cache.impl;
 
 import java.io.IOException;
 import java.nio.file.FileSystems;
@@ -31,6 +31,9 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiPredicate;
 import java.util.function.Function;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheFactory;
+import org.mvndaemon.mvnd.cache.CacheRecord;
 
 /**
  * A factory for {@link Cache} objects invalidating its entries based on events received from {@link WatchService}.
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliExtensionRealmCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java
similarity index 89%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliExtensionRealmCache.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java
index d6468041..28ecb10f 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliExtensionRealmCache.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingExtensionRealmCache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.impl;
+package org.mvndaemon.mvnd.cache.invalidating;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -27,14 +27,14 @@ import org.apache.maven.project.ExtensionDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
-import org.mvndaemon.mvnd.cache.factory.Cache;
-import org.mvndaemon.mvnd.cache.factory.CacheFactory;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheFactory;
 
 @Singleton
 @Named
-public class CliExtensionRealmCache extends DefaultExtensionRealmCache {
+public class InvalidatingExtensionRealmCache extends DefaultExtensionRealmCache {
 
-    protected static class Record implements org.mvndaemon.mvnd.cache.factory.CacheRecord {
+    protected static class Record implements org.mvndaemon.mvnd.cache.CacheRecord {
 
         private final CacheRecord record;
 
@@ -61,7 +61,7 @@ public class CliExtensionRealmCache extends DefaultExtensionRealmCache {
     private final Cache<Key, Record> cache;
 
     @Inject
-    public CliExtensionRealmCache(CacheFactory cacheFactory) {
+    public InvalidatingExtensionRealmCache(CacheFactory cacheFactory) {
         cache = cacheFactory.newCache();
     }
 
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginArtifactsCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java
similarity index 89%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginArtifactsCache.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java
index 94e88847..8e40ccfe 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginArtifactsCache.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginArtifactsCache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.impl;
+package org.mvndaemon.mvnd.cache.invalidating;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -23,14 +23,14 @@ import javax.inject.Singleton;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.DefaultPluginArtifactsCache;
 import org.apache.maven.plugin.PluginResolutionException;
-import org.mvndaemon.mvnd.cache.factory.Cache;
-import org.mvndaemon.mvnd.cache.factory.CacheFactory;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheFactory;
 
 @Singleton
 @Named
-public class CliPluginArtifactsCache extends DefaultPluginArtifactsCache {
+public class InvalidatingPluginArtifactsCache extends DefaultPluginArtifactsCache {
 
-    protected static class Record implements org.mvndaemon.mvnd.cache.factory.CacheRecord {
+    protected static class Record implements org.mvndaemon.mvnd.cache.CacheRecord {
 
         private final CacheRecord record;
 
@@ -50,7 +50,7 @@ public class CliPluginArtifactsCache extends DefaultPluginArtifactsCache {
 
     final Cache<Key, Record> cache;
 
-    public CliPluginArtifactsCache(CacheFactory cacheFactory) {
+    public InvalidatingPluginArtifactsCache(CacheFactory cacheFactory) {
         this.cache = cacheFactory.newCache();
     }
 
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginDescriptorCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
similarity index 92%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginDescriptorCache.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
index 3037220e..2fd7e84f 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginDescriptorCache.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginDescriptorCache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.impl;
+package org.mvndaemon.mvnd.cache.invalidating;
 
 import java.nio.file.Path;
 import java.util.Collections;
@@ -33,13 +33,13 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
-import org.mvndaemon.mvnd.cache.factory.Cache;
-import org.mvndaemon.mvnd.cache.factory.CacheFactory;
-import org.mvndaemon.mvnd.cache.factory.CacheRecord;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheFactory;
+import org.mvndaemon.mvnd.cache.CacheRecord;
 
 @Singleton
 @Named
-public class CliPluginDescriptorCache extends DefaultPluginDescriptorCache {
+public class InvalidatingPluginDescriptorCache extends DefaultPluginDescriptorCache {
 
     @FunctionalInterface
     public interface PluginDescriptorSupplier {
@@ -75,7 +75,7 @@ public class CliPluginDescriptorCache extends DefaultPluginDescriptorCache {
     final Cache<Key, Record> cache;
 
     @Inject
-    public CliPluginDescriptorCache(CacheFactory cacheFactory) {
+    public InvalidatingPluginDescriptorCache(CacheFactory cacheFactory) {
         this.cache = cacheFactory.newCache();
     }
 
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
similarity index 92%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCache.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
index 69c9a639..802bd854 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCache.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.impl;
+package org.mvndaemon.mvnd.cache.invalidating;
 
 import java.nio.file.Path;
 import java.util.List;
@@ -31,21 +31,21 @@ import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
 import org.eclipse.sisu.Priority;
 import org.eclipse.sisu.Typed;
-import org.mvndaemon.mvnd.cache.factory.Cache;
-import org.mvndaemon.mvnd.cache.factory.CacheFactory;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheFactory;
 
 @Singleton
 @Named
 @Priority(10)
 @Typed(PluginRealmCache.class)
-public class CliPluginRealmCache extends DefaultPluginRealmCache {
+public class InvalidatingPluginRealmCache extends DefaultPluginRealmCache {
 
     @FunctionalInterface
     public interface PluginRealmSupplier {
         CacheRecord load() throws PluginResolutionException, PluginContainerException;
     }
 
-    protected static class Record implements org.mvndaemon.mvnd.cache.factory.CacheRecord {
+    protected static class Record implements org.mvndaemon.mvnd.cache.CacheRecord {
 
         final CacheRecord record;
 
@@ -72,7 +72,7 @@ public class CliPluginRealmCache extends DefaultPluginRealmCache {
     final Cache<Key, Record> cache;
 
     @Inject
-    public CliPluginRealmCache(CacheFactory cacheFactory) {
+    public InvalidatingPluginRealmCache(CacheFactory cacheFactory) {
         cache = cacheFactory.newCache();
     }
 
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCacheEventSpy.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCacheEventSpy.java
similarity index 84%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCacheEventSpy.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCacheEventSpy.java
index 6a9ded82..022df1ae 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliPluginRealmCacheEventSpy.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingPluginRealmCacheEventSpy.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.impl;
+package org.mvndaemon.mvnd.cache.invalidating;
 
 import java.net.URISyntaxException;
 import java.net.URL;
@@ -33,15 +33,15 @@ import org.slf4j.LoggerFactory;
 @Named
 @Singleton
 @Typed(EventSpy.class)
-public class CliPluginRealmCacheEventSpy extends AbstractEventSpy {
+public class InvalidatingPluginRealmCacheEventSpy extends AbstractEventSpy {
 
-    private static final Logger LOG = LoggerFactory.getLogger(CliPluginRealmCacheEventSpy.class);
+    private static final Logger LOG = LoggerFactory.getLogger(InvalidatingPluginRealmCacheEventSpy.class);
 
-    private final CliPluginRealmCache cache;
+    private final InvalidatingPluginRealmCache cache;
     private Path multiModuleProjectDirectory;
 
     @Inject
-    public CliPluginRealmCacheEventSpy(CliPluginRealmCache cache) {
+    public InvalidatingPluginRealmCacheEventSpy(InvalidatingPluginRealmCache cache) {
         this.cache = cache;
     }
 
@@ -60,7 +60,7 @@ public class CliPluginRealmCacheEventSpy extends AbstractEventSpy {
         }
     }
 
-    private boolean shouldEvict(CliPluginRealmCache.Key k, CliPluginRealmCache.Record v) {
+    private boolean shouldEvict(InvalidatingPluginRealmCache.Key k, InvalidatingPluginRealmCache.Record v) {
         try {
             for (URL url : v.record.getRealm().getURLs()) {
                 if (url.getProtocol().equals("file")) {
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliProjectArtifactsCache.java b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java
similarity index 87%
rename from daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliProjectArtifactsCache.java
rename to daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java
index 9a838d8b..7087f88c 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/cache/impl/CliProjectArtifactsCache.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/cache/invalidating/InvalidatingProjectArtifactsCache.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.impl;
+package org.mvndaemon.mvnd.cache.invalidating;
 
 import java.io.File;
 import java.nio.file.Path;
@@ -27,14 +27,14 @@ import org.apache.maven.artifact.Artifact;
 import org.apache.maven.lifecycle.LifecycleExecutionException;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.artifact.DefaultProjectArtifactsCache;
-import org.mvndaemon.mvnd.cache.factory.Cache;
-import org.mvndaemon.mvnd.cache.factory.CacheFactory;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheFactory;
 
 @Singleton
 @Named
-public class CliProjectArtifactsCache extends DefaultProjectArtifactsCache {
+public class InvalidatingProjectArtifactsCache extends DefaultProjectArtifactsCache {
 
-    static class Record implements org.mvndaemon.mvnd.cache.factory.CacheRecord {
+    static class Record implements org.mvndaemon.mvnd.cache.CacheRecord {
         private final CacheRecord record;
 
         public Record(CacheRecord record) {
@@ -57,7 +57,7 @@ public class CliProjectArtifactsCache extends DefaultProjectArtifactsCache {
     final Cache<Key, Record> cache;
 
     @Inject
-    public CliProjectArtifactsCache(CacheFactory cacheFactory) {
+    public InvalidatingProjectArtifactsCache(CacheFactory cacheFactory) {
         this.cache = cacheFactory.newCache();
     }
 
diff --git a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java
index fe0a6870..2ff2bf85 100644
--- a/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java
+++ b/daemon/src/main/java/org/mvndaemon/mvnd/plugin/CliMavenPluginManager.java
@@ -108,8 +108,8 @@ import org.eclipse.aether.util.filter.AndDependencyFilter;
 import org.eclipse.aether.util.graph.visitor.PreorderNodeListGenerator;
 import org.eclipse.sisu.Priority;
 import org.eclipse.sisu.Typed;
-import org.mvndaemon.mvnd.cache.impl.CliPluginDescriptorCache;
-import org.mvndaemon.mvnd.cache.impl.CliPluginRealmCache;
+import org.mvndaemon.mvnd.cache.invalidating.InvalidatingPluginDescriptorCache;
+import org.mvndaemon.mvnd.cache.invalidating.InvalidatingPluginRealmCache;
 
 /*
  * gnodet: This file is based on maven DefaultMavenPluginManager and changed in order
@@ -154,10 +154,10 @@ public class CliMavenPluginManager
     private ClassRealmManager classRealmManager;
 
     @Inject
-    private CliPluginDescriptorCache pluginDescriptorCache;
+    private InvalidatingPluginDescriptorCache pluginDescriptorCache;
 
     @Inject
-    private CliPluginRealmCache pluginRealmCache;
+    private InvalidatingPluginRealmCache pluginRealmCache;
 
     @Inject
     private PluginDependenciesResolver pluginDependenciesResolver;
diff --git a/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactoryTest.java b/daemon/src/test/java/org/mvndaemon/mvnd/cache/factory/impl/TimestampCacheFactoryTest.java
similarity index 93%
rename from daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactoryTest.java
rename to daemon/src/test/java/org/mvndaemon/mvnd/cache/factory/impl/TimestampCacheFactoryTest.java
index c7af37a5..135c99bd 100644
--- a/daemon/src/test/java/org/mvndaemon/mvnd/cache/impl/TimestampCacheFactoryTest.java
+++ b/daemon/src/test/java/org/mvndaemon/mvnd/cache/factory/impl/TimestampCacheFactoryTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.mvndaemon.mvnd.cache.impl;
+package org.mvndaemon.mvnd.cache.factory.impl;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -25,9 +25,9 @@ import java.util.stream.Stream;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
-import org.mvndaemon.mvnd.cache.factory.Cache;
-import org.mvndaemon.mvnd.cache.factory.CacheRecord;
-import org.mvndaemon.mvnd.cache.factory.DefaultCacheFactory;
+import org.mvndaemon.mvnd.cache.Cache;
+import org.mvndaemon.mvnd.cache.CacheRecord;
+import org.mvndaemon.mvnd.cache.impl.DefaultCacheFactory;
 import org.mvndaemon.mvnd.common.Os;
 
 public class TimestampCacheFactoryTest {
@@ -79,7 +79,7 @@ public class TimestampCacheFactoryTest {
         Assertions.assertTrue(record2.invalidated);
     }
 
-    static class SimpleCacheRecord implements org.mvndaemon.mvnd.cache.factory.CacheRecord {
+    static class SimpleCacheRecord implements org.mvndaemon.mvnd.cache.CacheRecord {
 
         private final List<Path> paths;
         private boolean invalidated = false;