@@ -2047,18 +2047,20 @@
    (lambda (dbdat db)
        (if msg
          (sqlite3:execute db "UPDATE runs SET status=?,comment=? WHERE id=?;" status msg run-id)
          (sqlite3:execute db "UPDATE runs SET status=? WHERE id=?;" status run-id)))))
 
-(define (db:set-run-state-status-db db run-id state status )
-  (sqlite3:execute db "UPDATE runs SET status=?,state=? WHERE id=?;" status state run-id))
+(define (db:set-run-state-status-db dbdat db run-id state status )
+  (sqlite3:execute
+   (db:get-cache-stmth
+    dbdat db "UPDATE runs SET status=?,state=? WHERE id=?;") status state run-id))
 
 (define (db:set-run-state-status dbstruct run-id state status )
   (db:with-db
    dbstruct #f #f
    (lambda (dbdat db)
-     (db:set-run-state-status-db db run-id state status))))
+     (db:set-run-state-status-db dbdat db run-id state status))))
      
 (define (db:get-run-status dbstruct run-id)
   (let ((res "n/a"))
     (db:with-db
      dbstruct #f #f
@@ -2707,12 +2709,12 @@
      (let ((res #f))
        (sqlite3:for-each-row ;; attemptnum added to hold pid of top process (not Megatest) controlling a test
 	(lambda (id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update)
 	  ;;                0    1       2      3      4        5       6      7        8     9     10      11          12          13           14         15          16
 	  (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update)))
-	db
-	(conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id=?;")
+	(db:get-cache-stmth dbdat db
+			    (conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id=?;"))
 	test-id)
        res))))
 
 ;; Use db:test-get* to access
 ;; Get test data using test_ids. NB// Only works within a single run!!
@@ -3305,32 +3307,33 @@
      (lambda (dbdat db)
        (let ((tr-res
               (sqlite3:with-transaction
                db
                (lambda ()
-                   (let* ((state-status-counts (db:get-all-state-status-counts-for-run-db db run-id))
+                   (let* ((state-status-counts (db:get-all-state-status-counts-for-run-db dbdat db run-id))
 			  (state-statuses      (db:roll-up-rules state-status-counts #f #f ))
                           (newstate            (car state-statuses))
                           (newstatus           (cadr state-statuses))) 
 		     (if (or (not (eq? newstate curr-state)) (not (eq?  newstatus curr-status)))
-			 (db:set-run-state-status-db db run-id newstate newstatus )))))))
+			 (db:set-run-state-status-db dbdat db run-id newstate newstatus )))))))
          (mutex-unlock! *db-transaction-mutex*)
          tr-res))))
 
-(define (db:get-all-state-status-counts-for-run-db db run-id)
+(define (db:get-all-state-status-counts-for-run-db dbdat db run-id)
   (sqlite3:map-row
    (lambda (state status count)
      (make-dbr:counts state: state status: status count: count))
-   db
-   "SELECT state,status,count(id) FROM tests WHERE run_id=?  GROUP BY state,status;"
+   (db:get-cache-stmth
+    dbdat db
+    "SELECT state,status,count(id) FROM tests WHERE run_id=?  GROUP BY state,status;")
    run-id ))
 
 (define (db:get-all-state-status-counts-for-run dbstruct run-id)
   (db:with-db
    dbstruct #f #f
    (lambda (dbdat db)
-     (db:get-all-state-status-counts-for-run-db dbstruct run-id))))
+     (db:get-all-state-status-counts-for-run-db dbdat db run-id))))
 
 ;; BBnote: db:get-all-state-status-counts-for-test returns dbr:counts object aggregating state and status of items of a given test, *not including rollup state/status*
 ;;
 ;; NOTE: This is called within a transaction
 ;;