diff --git a/plugins/npm/npm.plugin.zsh b/plugins/npm/npm.plugin.zsh
index 43aedc36d..3961af8b0 100644
--- a/plugins/npm/npm.plugin.zsh
+++ b/plugins/npm/npm.plugin.zsh
@@ -1,46 +1,48 @@
-(( $+commands[npm] )) && {
-    __NPM_COMPLETION_FILE="${ZSH_CACHE_DIR}/npm_completion"
+(( $+commands[npm] )) &&
+{
 
-    if [[ ! -f $__NPM_COMPLETION_FILE ]]; then
-        npm completion >! $__NPM_COMPLETION_FILE 2>/dev/null
-        [[ $? -ne 0 ]] && rm -f $__NPM_COMPLETION_FILE
-    fi
+  COMPLETION="${ZSH_CACHE_DIR}/npm_completion"
 
-    [[ -f $__NPM_COMPLETION_FILE ]] && source $__NPM_COMPLETION_FILE
+  if [[ ! -f $COMPLETION ]]; then
+    npm completion 2>/dev/null >! $COMPLETION
+    source $COMPLETION
+  else
+    source $COMPLETION
+    npm completion 2>/dev/null >! $COMPLETION &
+  fi
 
-    unset __NPM_COMPLETION_FILE
+  unset COMPLETION
+
+  # Install dependencies globally
+  alias npmg="npm i -g "
+
+  # npm package names are lowercase
+  # Thus, we've used camelCase for the following aliases:
+
+  # Install and save to dependencies in your package.json
+  # npms is used by https://www.npmjs.com/package/npms
+  alias npmS="npm i -S "
+
+  # Install and save to dev-dependencies in your package.json
+  # npmd is used by https://github.com/dominictarr/npmd
+  alias npmD="npm i -D "
+
+  # Execute command from node_modules folder based on current directory
+  # i.e npmE gulp
+  alias npmE='PATH="$(npm bin)":"$PATH"'
+
+  # Check which npm modules are outdated
+  alias npmO="npm outdated"
+
+  # Check package versions
+  alias npmV="npm -v"
+
+  # List packages
+  alias npmL="npm list"
+
+  # Run npm start
+  alias npmst="npm start"
+
+  # Run npm test
+  alias npmt="npm test"
 }
-
-# Install dependencies globally
-alias npmg="npm i -g "
-
-# npm package names are lowercase
-# Thus, we've used camelCase for the following aliases:
-
-# Install and save to dependencies in your package.json
-# npms is used by https://www.npmjs.com/package/npms
-alias npmS="npm i -S "
-
-# Install and save to dev-dependencies in your package.json
-# npmd is used by https://github.com/dominictarr/npmd
-alias npmD="npm i -D "
-
-# Execute command from node_modules folder based on current directory
-# i.e npmE gulp
-alias npmE='PATH="$(npm bin)":"$PATH"'
-
-# Check which npm modules are outdated
-alias npmO="npm outdated"
-
-# Check package versions
-alias npmV="npm -v"
-
-# List packages
-alias npmL="npm list"
-
-# Run npm start
-alias npmst="npm start"
-
-# Run npm test
-alias npmt="npm test"
-