@@ -533,35 +533,13 @@
       (set! *didsomething* #t)))
 
 ;; handle a clean-cache request as early as possible
 ;;
 (if (args:get-arg "-clean-cache")
-    (begin
+    (let ((toppath  (launch:setup)))
       (set! *didsomething* #t) ;; suppress the help output.
-      (if (getenv "MT_TARGET") ;; no point in trying if no target
-	  (if (args:get-arg "-runname")
-	      (let* ((toppath  (launch:setup))
-		     (linktree (common:get-linktree)) ;; (if toppath (configf:lookup *configdat* "setup" "linktree")))
-		     (runtop   (conc linktree "/" (getenv "MT_TARGET") "/" (args:get-arg "-runname")))
-		     (files    (if (file-exists? runtop)
-				   (append (glob (conc runtop "/.megatest*"))
-					   (glob (conc runtop "/.runconfig*")))
-				   '())))
-		(if (null? files)
-		    (debug:print-info 0 *default-log-port* "No cached megatest or runconfigs files found. None removed.")
-		    (begin
-		      (debug:print-info 0 *default-log-port* "Removing cached files:\n    " (string-intersperse files "\n    "))
-		      (for-each 
-		       (lambda (f)
-			 (handle-exceptions
-			     exn
-			     (debug:print 0 *default-log-port* "WARNING: Failed to remove file " f)
-			   (delete-file f)))
-		       files))))
-	      (debug:print-error 0 *default-log-port* "-clean-cache requires -runname."))
-	  (debug:print-error 0 *default-log-port* "-clean-cache requires -target or -reqtarg"))))
-	    
+      (runs:clean-cache (getenv "MT_TARGET")(args:get-arg "-runname" toppath))))
 	  
 (if (args:get-arg "-env2file")
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
@@ -1455,10 +1433,11 @@
 			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
 			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
 			      state:  states
 			      ;; status: statuses
 			      new-state-status: "NOT_STARTED,n/a")
+	     (runs:clean-cache target runname *toppath*)
 	     (runs:operate-on 'set-state-status
 			      target
 			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
 			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
 			      ;; state:  states
@@ -1473,10 +1452,11 @@
 			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
 			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
 			      state:  #f
 			      ;; status: statuses
 			      new-state-status: "NOT_STARTED,n/a")
+	     (runs:clean-cache target runname *toppath*)
 	     (runs:operate-on 'set-state-status
 			      target
 			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
 			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
 			      ;; state:  states