diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 08dbedca281..b4aaf942b56 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -125,6 +125,16 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Cache/TimestampQueryCacheValidator.php
 
+		-
+			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\ArrayCache not found\\.$#"
+			count: 2
+			path: lib/Doctrine/ORM/Configuration.php
+
+		-
+			message: "#^Parameter \\#2 \\$cache of class Doctrine\\\\Common\\\\Annotations\\\\CachedReader constructor expects Doctrine\\\\Common\\\\Cache\\\\Cache, Doctrine\\\\Common\\\\Cache\\\\ArrayCache given\\.$#"
+			count: 1
+			path: lib/Doctrine/ORM/Configuration.php
+
 		-
 			message: "#^Method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:find\\(\\) invoked with 4 parameters, 2 required\\.$#"
 			count: 1
@@ -1415,6 +1425,11 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Query/Parser.php
 
+		-
+			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+			count: 3
+			path: lib/Doctrine/ORM/Query/Parser.php
+
 		-
 			message: "#^Method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:ArithmeticFactor\\(\\) should return Doctrine\\\\ORM\\\\Query\\\\AST\\\\ArithmeticFactor but returns Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node\\|string\\.$#"
 			count: 1
@@ -1436,11 +1451,6 @@ parameters:
 			count: 1
 			path: lib/Doctrine/ORM/Query/Parser.php
 
-		-
-			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
-			count: 3
-			path: lib/Doctrine/ORM/Query/Parser.php
-
 		-
 			message: "#^Parameter \\#2 \\$stringPattern of class Doctrine\\\\ORM\\\\Query\\\\AST\\\\LikeExpression constructor expects Doctrine\\\\ORM\\\\Query\\\\AST\\\\InputParameter, Doctrine\\\\ORM\\\\Query\\\\AST\\\\Node given\\.$#"
 			count: 1
@@ -2016,11 +2026,31 @@ parameters:
 			count: 2
 			path: lib/Doctrine/ORM/QueryBuilder.php
 
+		-
+			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\ApcCache not found\\.$#"
+			count: 1
+			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php
+
+		-
+			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\XcacheCache not found\\.$#"
+			count: 1
+			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryCommand.php
+
 		-
 			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
 			count: 1
 			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/QueryRegionCommand.php
 
+		-
+			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\ApcCache not found\\.$#"
+			count: 1
+			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php
+
+		-
+			message: "#^Class Doctrine\\\\Common\\\\Cache\\\\XcacheCache not found\\.$#"
+			count: 1
+			path: lib/Doctrine/ORM/Tools/Console/Command/ClearCache/ResultCommand.php
+
 		-
 			message: "#^Parameter \\#1 \\$metadata of method Doctrine\\\\ORM\\\\Tools\\\\Export\\\\Driver\\\\AbstractExporter\\:\\:setMetadata\\(\\) expects array\\<int, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\>, array\\<int, Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadataInfo\\> given\\.$#"
 			count: 1
diff --git a/psalm.xml b/psalm.xml
index 82a41197b3f..aed0fd50a01 100644
--- a/psalm.xml
+++ b/psalm.xml
@@ -28,5 +28,12 @@
                 <file name="lib/Doctrine/ORM/Mapping/Driver/AttributeReader.php"/>
             </errorLevel>
         </NullArgument>
+        <UndefinedClass>
+            <errorLevel type="suppress">
+                <referencedClass name="Doctrine\Common\Cache\ApcCache"/>
+                <referencedClass name="Doctrine\Common\Cache\ArrayCache"/>
+                <referencedClass name="Doctrine\Common\Cache\XcacheCache"/>
+            </errorLevel>
+        </UndefinedClass>
     </issueHandlers>
 </psalm>