diff --git a/share/functions/__fish_print_eopkg_packages.fish b/share/functions/__fish_print_eopkg_packages.fish
index 1fe9c5f32..216232e6e 100644
--- a/share/functions/__fish_print_eopkg_packages.fish
+++ b/share/functions/__fish_print_eopkg_packages.fish
@@ -11,7 +11,7 @@ function __fish_print_eopkg_packages
     # Determine whether to print installed/available packages
 
     if set -q _flag_installed
-        set -l cache_file $xdg_cache_home/.eopkg-installed-cache.$USER
+        set -l cache_file $xdg_cache_home/eopkg-installed
         if test -f $cache_file
             cat $cache_file
             set -l age (path mtime -R -- $cache_file)
@@ -25,7 +25,7 @@ function __fish_print_eopkg_packages
         eopkg list-installed -N | cut -d ' ' -f 1 >$cache_file &
         return 0
     else
-        set -l cache_file $xdg_cache_home/.eopkg-available-cache.$USER
+        set -l cache_file $xdg_cache_home/eopkg-available
         if test -f $cache_file
             cat $cache_file
             set -l age (path mtime -R -- $cache_file)
diff --git a/share/functions/__fish_print_pacman_packages.fish b/share/functions/__fish_print_pacman_packages.fish
index 85c0772fd..8ff91bb01 100644
--- a/share/functions/__fish_print_pacman_packages.fish
+++ b/share/functions/__fish_print_pacman_packages.fish
@@ -9,7 +9,7 @@ function __fish_print_pacman_packages
     or return
 
     if not set -q _flag_installed
-        set -l cache_file $xdg_cache_home/.pac-cache.$USER
+        set -l cache_file $xdg_cache_home/pacman
         if test -f $cache_file
             cat $cache_file
             set -l age (path mtime -R -- $cache_file)
diff --git a/share/functions/__fish_print_port_packages.fish b/share/functions/__fish_print_port_packages.fish
index d42c70595..843829496 100644
--- a/share/functions/__fish_print_port_packages.fish
+++ b/share/functions/__fish_print_port_packages.fish
@@ -5,7 +5,7 @@ function __fish_print_port_packages
     set -l xdg_cache_home (__fish_make_cache_dir)
     or return
 
-    set -l cache_file $xdg_cache_home/.port-cache.$USER
+    set -l cache_file $xdg_cache_home/port
     if test -f $cache_file
         cat $cache_file
         set -l age (path mtime -R -- $cache_file)
diff --git a/share/functions/__fish_print_rpm_packages.fish b/share/functions/__fish_print_rpm_packages.fish
index b802a8277..051a6eaf6 100644
--- a/share/functions/__fish_print_rpm_packages.fish
+++ b/share/functions/__fish_print_rpm_packages.fish
@@ -10,7 +10,7 @@ function __fish_print_rpm_packages
 
     if type -q -f /usr/share/yum-cli/completion-helper.py
         # If the cache is less than six hours old, we do not recalculate it
-        set -l cache_file $xdg_cache_home/.yum-cache.$USER
+        set -l cache_file $xdg_cache_home/yum
         if test -f $cache_file
             cat $cache_file
             set -l age (path mtime -R -- $cache_file)
@@ -29,7 +29,7 @@ function __fish_print_rpm_packages
     # as a background job and cache the results.
     if type -q -f rpm
         # If the cache is less than five minutes old, we do not recalculate it
-        set -l cache_file $xdg_cache_home/.rpm-cache.$USER
+        set -l cache_file $xdg_cache_home/rpm
         if test -f $cache_file
             cat $cache_file
             set -l age (path mtime -R -- $cache_file)
diff --git a/share/functions/__fish_print_xbps_packages.fish b/share/functions/__fish_print_xbps_packages.fish
index 3436abc67..af113439e 100644
--- a/share/functions/__fish_print_xbps_packages.fish
+++ b/share/functions/__fish_print_xbps_packages.fish
@@ -9,7 +9,7 @@ function __fish_print_xbps_packages
     or return
 
     if not set -q _flag_installed
-        set -l cache_file $xdg_cache_home/.xbps-cache.$USER
+        set -l cache_file $xdg_cache_home/xbps
         if test -f $cache_file
             set -l age (path mtime -R -- $cache_file)
             set -l max_age 300