diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index e15f18331..c2905d843 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -105,6 +105,7 @@
     ->registerBuiltInFixers()
     ->registerCustomFixers($config->getCustomFixers())
     ->useRuleSet(new PhpCsFixer\RuleSet\RuleSet($config->getRules()))
+    ->setCacheFile(__DIR__.'/dist/.php-cs-fixer.cache')
 ;
 
 return $config;
diff --git a/Makefile b/Makefile
index 9c8d9dee6..a326a6a81 100644
--- a/Makefile
+++ b/Makefile
@@ -44,6 +44,8 @@ clean:
 	rm -rf fixtures/check-requirements || true
 	@# Obsolete entries; Only relevant to someone who still has old artifacts locally
 	@rm -rf \
+		.php-cs-fixer.cache \
+		.phpunit.result.cache \
 		site \
 		website \
 		|| true
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
deleted file mode 100644
index 2eca2df2e..000000000
--- a/phpcs.xml.dist
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset
-        name="Doctrine"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:noNamespaceSchemaLocation="vendor-bin/doctrine-cs/vendor/squizlabs/php_codesniffer/phpcs.xsd"
->
-    <arg name="extensions" value="php"/>
-    <arg name="parallel" value="80"/>
-    <arg name="cache" value=".phpcs-cache"/>
-    <arg name="colors"/>
-    <arg value="ps"/>
-
-    <file>fixtures</file>
-    <exclude-pattern>default_stub\.php</exclude-pattern>
-    <exclude-pattern>src/Box\.php</exclude-pattern>
-    <exclude-pattern>/vendor/</exclude-pattern>
-    <exclude-pattern>/build/</exclude-pattern>
-    <file>src</file>
-    <file>tests</file>
-
-    <rule ref="SlevomatCodingStandard.Commenting.InlineDocCommentDeclaration.InvalidFormat"/>
-    <rule ref="SlevomatCodingStandard.Functions.StaticClosure"/>
-    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFallbackGlobalName"/>
-    <rule ref="SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName">
-        <exclude-pattern>src/bootstrap\.php</exclude-pattern>
-        <exclude-pattern>src/functions\.php</exclude-pattern>
-    </rule>
-    <rule ref="SlevomatCodingStandard.Namespaces.UseDoesNotStartWithBackslash"/>
-    <rule ref="SlevomatCodingStandard.PHP.OptimizedFunctionsWithoutUnpacking"/>
-    <rule ref="SlevomatCodingStandard.PHP.TypeCast"/>
-</ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2006b13df..079ed81b4 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -7,7 +7,8 @@
          beStrictAboutResourceUsageDuringSmallTests="true"
          convertDeprecationsToExceptions="true"
          colors="true"
-         executionOrder="random">
+         executionOrder="random"
+         cacheResultFile="dist/.php-cs-fixer.cache">
 
     <php>
         <env name="BOX_ALLOW_XDEBUG" value="1"/>