diff --git a/conf/config.py b/conf/config.py
index 583bfdd0..16fe4d5d 100644
--- a/conf/config.py
+++ b/conf/config.py
@@ -90,8 +90,6 @@ class BaseConfiguration(object):
     # Disable Client Authorization
     NO_AUTH = False
 
-    CACHE_DIR = "~/modulebuild/cache"
-
 
 class TestConfiguration(BaseConfiguration):
     BUILD_LOGS_DIR = "/tmp"
@@ -134,6 +132,7 @@ class ProdConfiguration(BaseConfiguration):
 
 
 class LocalBuildConfiguration(BaseConfiguration):
+    CACHE_DIR = "~/modulebuild/cache"
     LOG_LEVEL = "debug"
     MESSAGING = "in_memory"
 
diff --git a/module_build_service/config.py b/module_build_service/config.py
index 35d7c450..7cdbbf47 100644
--- a/module_build_service/config.py
+++ b/module_build_service/config.py
@@ -29,6 +29,7 @@ import os
 import pkg_resources
 import re
 import sys
+import tempfile
 
 from six import string_types
 
@@ -146,7 +147,11 @@ class Config(object):
             "desc": "Default dist-tag prefix for built modules.",
         },
         "polling_interval": {"type": int, "default": 0, "desc": "Polling interval, in seconds."},
-        "cache_dir": {"type": Path, "default": "~/modulebuild/cache", "desc": "Cache directory"},
+        "cache_dir": {
+            "type": Path,
+            "default": os.path.join(tempfile.gettempdir(), "mbs"),
+            "desc": "Cache directory"
+        },
         "mbs_url": {
             "type": str,
             "default": "https://mbs.fedoraproject.org/module-build-service/1/module-builds/",