diff --git a/jps/jps-builders/intellij.platform.jps.build.iml b/jps/jps-builders/intellij.platform.jps.build.iml
index 0b7feaa2ed66..b9d7766a5aa0 100644
--- a/jps/jps-builders/intellij.platform.jps.build.iml
+++ b/jps/jps-builders/intellij.platform.jps.build.iml
@@ -40,7 +40,6 @@
     <orderEntry type="module" module-name="intellij.platform.jps.model" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.serialization" />
     <orderEntry type="module" module-name="intellij.platform.jps.model.impl" />
-    <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="library" name="netty-codec-http" level="project" />
     <orderEntry type="library" name="javax.annotation-api" level="project" />
     <orderEntry type="module-library">
diff --git a/jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java b/jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java
index 4135bd8d0754..4c60747492e2 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/cache/loader/JpsCompilationOutputLoader.java
@@ -1,7 +1,5 @@
 package org.jetbrains.jps.cache.loader;
 
-import com.google.common.hash.Hasher;
-import com.google.common.hash.Hashing;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.util.io.FileUtil;
@@ -12,15 +10,17 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.TestOnly;
 import org.jetbrains.jps.builders.JpsBuildBundle;
+import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
+import org.jetbrains.jps.builders.java.ResourcesTargetType;
 import org.jetbrains.jps.cache.client.JpsServerClient;
 import org.jetbrains.jps.cache.model.AffectedModule;
 import org.jetbrains.jps.cache.model.BuildTargetState;
 import org.jetbrains.jps.cache.model.JpsLoaderContext;
 import org.jetbrains.jps.cache.model.OutputLoadResult;
+import org.jetbrains.xxh3.Xxh3;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutionException;
@@ -31,10 +31,10 @@ import static org.jetbrains.jps.cache.JpsCachesLoaderUtil.EXECUTOR_SERVICE;
 
 class JpsCompilationOutputLoader implements JpsOutputLoader<List<OutputLoadResult>> {
   private static final Logger LOG = Logger.getInstance(JpsCompilationOutputLoader.class);
-  private static final String RESOURCES_PRODUCTION = "resources-production";
-  private static final String JAVA_PRODUCTION = "java-production";
-  private static final String RESOURCES_TEST = "resources-test";
-  private static final String JAVA_TEST = "java-test";
+  private static final String RESOURCES_PRODUCTION = ResourcesTargetType.PRODUCTION.getTypeId();
+  private static final String JAVA_PRODUCTION = JavaModuleBuildTargetType.PRODUCTION.getTypeId();
+  private static final String RESOURCES_TEST = ResourcesTargetType.TEST.getTypeId();
+  private static final String JAVA_TEST = JavaModuleBuildTargetType.TEST.getTypeId();
   private static final String PRODUCTION = "production";
   private static final String TEST = "test";
   private final JpsServerClient myClient;
@@ -302,8 +302,7 @@ class JpsCompilationOutputLoader implements JpsOutputLoader<List<OutputLoadResul
   }
 
   private static String calculateStringHash(String content) {
-    Hasher hasher = Hashing.murmur3_128().newHasher();
-    return hasher.putString(content, StandardCharsets.UTF_8).hash().toString();
+    return String.valueOf(Xxh3.hash(content));
   }
 
   @TestOnly
diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
index b357ab091182..31a1c058ad8d 100644
--- a/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
+++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
@@ -1,7 +1,6 @@
 // Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
 package org.jetbrains.jps.incremental;
 
-import com.google.common.collect.Lists;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.*;
 import com.intellij.openapi.util.io.FileUtil;
@@ -1028,7 +1027,8 @@ public final class IncProjectBuilder {
       Tracer.Span prioritisationSpan = Tracer.start("IncProjectBuilder.prioritisation");
       // bitset stores indexes of transitively dependant tasks
       HashMap<BuildChunkTask, BitSet> chunkToTransitive = new HashMap<>();
-      for (BuildChunkTask task : Lists.reverse(myTasks)) {
+      for (int i = myTasks.size() - 1; i >= 0; i--) {
+        BuildChunkTask task = myTasks.get(i);
         List<BuildChunkTask> dependantTasks = task.myTasksDependsOnThis;
         Set<BuildChunkTask> directDependants = new HashSet<>(dependantTasks);
         BitSet transitiveDependants = new BitSet();