diff --git a/lib/menubar/init.lua b/lib/menubar/init.lua
index 776adea1b..8252baebf 100644
--- a/lib/menubar/init.lua
+++ b/lib/menubar/init.lua
@@ -130,7 +130,7 @@ local function load_count_table()
         return instance.count_table
     end
     instance.count_table = {}
-    local count_file_name = gfs.get_dir("cache") .. "/menu_count_file"
+    local count_file_name = gfs.get_cache_dir() .. "/menu_count_file"
     local count_file = io.open (count_file_name, "r")
     if count_file then
         for line in count_file:lines() do
@@ -146,7 +146,7 @@ end
 
 local function write_count_table(count_table)
     count_table = count_table or instance.count_table
-    local count_file_name = gfs.get_dir("cache") .. "/menu_count_file"
+    local count_file_name = gfs.get_cache_dir() .. "/menu_count_file"
     local count_file = assert(io.open(count_file_name, "w"))
     for name, count in pairs(count_table) do
         local str = string.format("%s;%d\n", name, count)
diff --git a/tests/examples/wibox/awidget/prompt/hooks.lua b/tests/examples/wibox/awidget/prompt/hooks.lua
index 90fefe969..70940681e 100644
--- a/tests/examples/wibox/awidget/prompt/hooks.lua
+++ b/tests/examples/wibox/awidget/prompt/hooks.lua
@@ -54,7 +54,7 @@ local gfs       = require("gears.filesystem") --DOC_HIDE
         prompt        = "<b>Run: </b>",
         hooks         = hooks,
         textbox       = atextbox,
-        history_path  = gfs.get_dir("cache") .. "/history",
+        history_path  = gfs.get_cache_dir() .. "/history",
         done_callback = clear,
     }
 
diff --git a/tests/examples/wibox/awidget/prompt/keypress.lua b/tests/examples/wibox/awidget/prompt/keypress.lua
index 5264e7fd5..26a105d25 100644
--- a/tests/examples/wibox/awidget/prompt/keypress.lua
+++ b/tests/examples/wibox/awidget/prompt/keypress.lua
@@ -24,7 +24,7 @@ local naughty   = {} --DOC_HIDE
             end
         end,
         textbox              = atextbox,
-        history_path         = gfs.get_dir("cache") .. "/history",
+        history_path         = gfs.get_cache_dir() .. "/history",
     }
 
 parent:add( wibox.widget {    --DOC_HIDE
diff --git a/tests/examples/wibox/awidget/prompt/vilike.lua b/tests/examples/wibox/awidget/prompt/vilike.lua
index 8d45296b0..445d74f56 100644
--- a/tests/examples/wibox/awidget/prompt/vilike.lua
+++ b/tests/examples/wibox/awidget/prompt/vilike.lua
@@ -44,7 +44,7 @@ local terminal  = "xterm"  --DOC_HIDE
             end},
         },
         textbox      = atextbox,
-        history_path = gfs.get_dir('cache') .. '/history',
+        history_path = gfs.get_cache_dir() .. '/history',
         exe_callback = function(cmd) awful.spawn(cmd) end
     }