diff --git a/platformio/__init__.py b/platformio/__init__.py
index d8d69720..32c14c03 100644
--- a/platformio/__init__.py
+++ b/platformio/__init__.py
@@ -14,7 +14,7 @@
 
 import sys
 
-VERSION = (3, 1, "0a1")
+VERSION = (3, 1, "0a2")
 __version__ = ".".join([str(s) for s in VERSION])
 
 __title__ = "platformio"
diff --git a/platformio/maintenance.py b/platformio/maintenance.py
index 6d457576..0494eff4 100644
--- a/platformio/maintenance.py
+++ b/platformio/maintenance.py
@@ -43,9 +43,8 @@ def in_silence(ctx=None):
 
 
 def clean_cache(ctx):
-    if ctx.args and (ctx.args[0] == "upgrade" or "update" in ctx.args):
-        with app.LocalCache() as lc:
-            lc.clean()
+    with app.LocalCache() as lc:
+        lc.clean()
 
 
 def on_platformio_start(ctx, force, caller):
@@ -58,9 +57,10 @@ def on_platformio_start(ctx, force, caller):
     app.set_session_var("command_ctx", ctx)
     app.set_session_var("force_option", force)
     app.set_session_var("caller_id", caller)
-    clean_cache(ctx)
     telemetry.on_command()
 
+    if ctx.args and (ctx.args[0] == "upgrade" or "update" in ctx.args):
+        clean_cache()
     if not in_silence(ctx):
         after_upgrade(ctx)