diff --git a/CHANGELOG b/CHANGELOG
index 91d2b51..d8fe936 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@
 
 
 ## 2.2 - Unpublished
+- cache folder is now configurable through $OFFPUNK_CACHE_PATH environment variable (by prx)
 - offpunk: adding an URL to a list now update the view mode if url already present
 - netcache: solve an infinite gemini loop with code 6X (see also bug #31)
 - ansicat: added support for <video> HTML-element
diff --git a/offutils.py b/offutils.py
index a2097e9..0d4244c 100644
--- a/offutils.py
+++ b/offutils.py
@@ -68,6 +68,9 @@ def xdg(folder="cache"):
                     os.path.join(_home,'.cache')
     _CACHE_PATH = os.environ.get('OFFPUNK_CACHE_PATH', \
         os.path.join(os.path.expanduser(cache_home),"offpunk/"))
+    #Check that the cache path ends with "/"
+    if not _CACHE_PATH.endswith("/"):
+        _CACHE_PATH += "/"
     os.makedirs(_CACHE_PATH,exist_ok=True)
     if folder == "cache" and not UPGRADED:
         upgrade_cache(_CACHE_PATH)