diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
new file mode 100644
index 000000000..ce4b500dc
--- /dev/null
+++ b/.github/workflows/maven-verify.yml
@@ -0,0 +1,29 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: Verify
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  build:
+    name: Verify
+    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
+    with:
+      maven4-enabled: true
diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
index 748ec60c9..454346c8e 100644
--- a/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
+++ b/client/src/main/java/org/mvndaemon/mvnd/client/DaemonConnector.java
@@ -42,7 +42,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
-import org.apache.maven.slf4j.MavenSimpleLogger;
+import org.apache.maven.api.Constants;
 import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec;
 import org.mvndaemon.mvnd.common.DaemonCompatibilitySpec.Result;
 import org.mvndaemon.mvnd.common.DaemonConnection;
@@ -440,7 +440,7 @@ private Process startDaemonProcess(String daemonId, ClientOutput output) {
             args.add("-Dmaven.conf=" + mvndHome.resolve("mvn").resolve("conf"));
             args.add("-Dclassworlds.conf=" + mvndHome.resolve("bin").resolve("mvnd-daemon.conf"));
 
-            args.add("-D" + MavenSimpleLogger.LOG_FILE_KEY + "="
+            args.add("-D" + Constants.MAVEN_LOGGER_LOG_FILE + "="
                     + parameters.daemonStorage().resolve("daemon-" + daemonId + ".log"));
 
             Environment.MVND_JAVA_HOME.addSystemProperty(
diff --git a/daemon/src/main/java/org/apache/maven/project/SnapshotModelCache.java b/daemon/src/main/java/org/apache/maven/project/SnapshotModelCache.java
index 0ab483af4..eb86706db 100644
--- a/daemon/src/main/java/org/apache/maven/project/SnapshotModelCache.java
+++ b/daemon/src/main/java/org/apache/maven/project/SnapshotModelCache.java
@@ -18,9 +18,11 @@
  */
 package org.apache.maven.project;
 
+import java.util.List;
 import java.util.Objects;
 import java.util.function.Supplier;
 
+import org.apache.maven.api.RemoteRepository;
 import org.apache.maven.api.services.Source;
 import org.apache.maven.api.services.model.ModelCache;
 
@@ -35,8 +37,15 @@ public SnapshotModelCache(ModelCache globalCache, ModelCache reactorCache) {
     }
 
     @Override
-    public <T> T computeIfAbsent(String groupId, String artifactId, String version, String tag, Supplier<T> data) {
-        return getDelegate(version).computeIfAbsent(groupId, artifactId, version, tag, data);
+    public <T> T computeIfAbsent(
+            List<RemoteRepository> repositories,
+            String groupId,
+            String artifactId,
+            String version,
+            String classifier,
+            String tag,
+            Supplier<T> data) {
+        return getDelegate(version).computeIfAbsent(repositories, groupId, artifactId, version, classifier, tag, data);
     }
 
     @Override
diff --git a/daemon/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java b/daemon/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java
index d276439f7..abbeda8d0 100644
--- a/daemon/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java
+++ b/daemon/src/main/java/org/apache/maven/project/SnapshotModelCacheFactory.java
@@ -24,7 +24,6 @@
 import org.apache.maven.api.di.Singleton;
 import org.apache.maven.api.services.model.ModelCache;
 import org.apache.maven.api.services.model.ModelCacheFactory;
-import org.apache.maven.internal.impl.model.DefaultModelCacheFactory;
 
 import static org.mvndaemon.mvnd.common.Environment.MVND_NO_MODEL_CACHE;
 
@@ -37,7 +36,7 @@ public class SnapshotModelCacheFactory implements ModelCacheFactory {
     private final ModelCache globalCache;
 
     @Inject
-    public SnapshotModelCacheFactory(DefaultModelCacheFactory factory) {
+    public SnapshotModelCacheFactory(ModelCacheFactory factory) {
         this.factory = factory;
         this.globalCache = factory.newInstance();
     }