diff --git a/plugins/cap/cap.plugin.zsh b/plugins/cap/cap.plugin.zsh
deleted file mode 100644
index d22d10401..000000000
--- a/plugins/cap/cap.plugin.zsh
+++ /dev/null
@@ -1,41 +0,0 @@
-stat -f%m . > /dev/null 2>&1
-if [ "$?" = 0 ]; then
-  stat_cmd=(stat -f%m)
-else
-  stat_cmd=(stat -L --format=%y)
-fi
-
-# Cache filename
-_cap_show_undescribed_tasks=0
-
-# Cache filename
-_cap_task_cache_file='.cap_task_cache'
-
-_cap_get_task_list () {
-  if [ ${_cap_show_undescribed_tasks} -eq 0 ]; then
-    cap -T | grep '^cap' | cut -d " " -f 2
-  else
-    cap -vT | grep '^cap' | cut -d " " -f 2
-  fi
-}
-
-_cap_does_task_list_need_generating () {
-
-  if [ ! -f ${_cap_task_cache_file} ]; then return 0;
-  else
-    accurate=$($stat_cmd $_cap_task_cache_file)
-    changed=$($stat_cmd config/deploy.rb)
-    return $(expr $accurate '>=' $changed)
-  fi
-}
-
-function _cap () {
-  if [ -f config/deploy.rb ]; then
-    if _cap_does_task_list_need_generating; then
-      _cap_get_task_list > ${_cap_task_cache_file}
-    fi
-    compadd `cat ${_cap_task_cache_file}`
-  fi
-}
-
-compdef _cap cap
diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano
new file mode 100644
index 000000000..cf6b50c7f
--- /dev/null
+++ b/plugins/capistrano/_capistrano
@@ -0,0 +1,10 @@
+#compdef cap
+#autoload
+
+if [ -f config/deploy.rb ]; then
+  if [[ ! -f .cap_tasks~ || config/deploy.rb -nt .cap_tasks~ ]]; then
+    echo "\nGenerating .cap_tasks~..." > /dev/stderr
+    cap --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~
+  fi
+  compadd `cat .cap_tasks~`
+fi