diff --git a/.gitignore b/.gitignore
index a77ac4a8b7..ee81557b83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ test/coverage/
 config/development.config.php
 vendor-bin/**/composer.lock
 .phpunit.result.cache
-data/cache/*
 
 # Non-dist files for the static analysis.
 # This allows developers to set a different (more strict) static analysis locally.
diff --git a/config/autoload/config.global.php b/config/autoload/config.global.php
index 69a69b8ac2..7d98c2dbab 100644
--- a/config/autoload/config.global.php
+++ b/config/autoload/config.global.php
@@ -160,7 +160,7 @@
             ],
         ],
     ],
-    'html-purifier-cache-dir' => '/var/tmp/htmlPurifierCache',
+    'html-purifier-cache-dir' => 'data/cache/HtmlPurifier',
 
     'auth' => [
         'user_unique_id_salt' => '%user_unique_id_salt%',
diff --git a/config/autoload/local.php.dist b/config/autoload/local.php.dist
index 68e3df2a99..0bd034118e 100644
--- a/config/autoload/local.php.dist
+++ b/config/autoload/local.php.dist
@@ -129,8 +129,6 @@ return [
             ],
         ],
     ],
-    'html-purifier-cache-dir' => '/tmp',
-
     'auth' => [
         'user_unique_id_salt' => '1234',
     ],
diff --git a/data/cache/.gitignore b/data/cache/.gitignore
index d6b7ef32c8..51f962d437 100644
--- a/data/cache/.gitignore
+++ b/data/cache/.gitignore
@@ -1,2 +1,3 @@
 *
 !.gitignore
+!*/
diff --git a/data/cache/HtmlPurifier/.gitignore b/data/cache/HtmlPurifier/.gitignore
new file mode 100644
index 0000000000..d6b7ef32c8
--- /dev/null
+++ b/data/cache/HtmlPurifier/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore