diff --git a/.gitignore b/.gitignore
index 011328ed9a..0723541d7a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 /analysis
 /vendor/
 /phpunit.xml
-/.php_cs.cache
 
 ## IDE support
 *.buildpath
diff --git a/.php_cs.dist b/.php_cs.dist
index 5a494b87a7..29b85d77d3 100644
--- a/.php_cs.dist
+++ b/.php_cs.dist
@@ -9,6 +9,7 @@ $finder = PhpCsFixer\Finder::create()
 return PhpCsFixer\Config::create()
     ->setRiskyAllowed(true)
     ->setFinder($finder)
+    ->setCacheFile(sys_get_temp_dir() . '/php-cs-fixer' . preg_replace('~\W~', '-', __DIR__))
     ->setRules([
         'align_multiline_comment' => true,
         'array_syntax' => ['syntax' => 'short'],