diff --git a/share/functions/__fish_make_cache_dir.fish b/share/functions/__fish_make_cache_dir.fish
index 0efd1e7d9..e068027ba 100644
--- a/share/functions/__fish_make_cache_dir.fish
+++ b/share/functions/__fish_make_cache_dir.fish
@@ -3,6 +3,10 @@ function __fish_make_cache_dir --description "Create and return XDG_CACHE_HOME"
     if test -z "$xdg_cache_home"; or string match -qv '/*' -- $xdg_cache_home; or set -q xdg_cache_home[2]
         set xdg_cache_home $HOME/.cache
     end
-    mkdir -m 700 -p $xdg_cache_home
-    and echo $xdg_cache_home
+
+    # If we get an argument, we try to create that as a subdirectory.
+    # So if you call `__fish_make_cache_dir completions`,
+    # this creates e.g. ~/.cache/fish/completions
+    mkdir -m 700 -p $xdg_cache_home/fish/"$argv[1]"
+    and echo $xdg_cache_home/fish/"$argv[1]"
 end