Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -94,10 +94,18 @@
 
 (define (db:hoh-get dat key1 key2)
   (let* ((subhash (hash-table-ref/default dat key1 #f)))
     (and subhash
 	 (hash-table-ref/default subhash key2 #f))))
+
+(define (db:get-cache-stmth dbstruct db stmt)
+  (let* ((stmt-cache        (dbr:dbstruct-stmt-cache dbstruct))
+	 (stmth             (db:hoh-get stmt-cache db stmt)))
+    (or stmth
+	(let* ((newstmth (sqlite3:prepare db stmt)))
+	  (db:hoh-set! stmt-cache db stmt newstmth)
+	  newstmth))))
 
 ;;======================================================================
 ;; SQLITE3 HELPERS
 ;;======================================================================
 
@@ -2887,24 +2895,29 @@
 				(if sort-order sort-order " ")
 				(if limit  (conc " LIMIT " limit)   " ")
 				(if offset (conc " OFFSET " offset) " ")
 				";"
 				)))
+
     (debug:print-info 8 *default-log-port* "db:get-tests-for-run run-id=" run-id ", qry=" qry)
-    (db:with-db dbstruct run-id #f
-		(lambda (db)
-		  (sqlite3:for-each-row 
-		   (lambda (a . b) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment)
-		     (set! res (cons (apply vector a b) res))) ;; id run-id testname state status event-time host cpuload diskfree uname rundir item-path run-duration final-logf comment) res)))
-		   db
-		   qry
-		   (or run-id 1) ;; 1 > 0 , for the case where we are seeking tests matching criteral for all runs
-		   )))
-    (case qryvals
-      ((shortlist)(map db:test-short-record->norm res))
-      ((#f)       res)
-      (else       res))))
+    (let* ((res (db:with-db dbstruct run-id #f
+			    (lambda (db)
+			      (let* ((stmth (db:get-cache-stmth dbstruct db qry)))
+				(reverse
+				 (sqlite3:fold-row
+				  (lambda (res . row)
+				    ;; id run-id testname state status event-time host cpuload
+				    ;;     diskfree uname rundir item-path run-duration final-logf comment)
+				    (cons (list->vector row) res))
+				  '()
+				  stmth
+				  (or run-id 1) ;; 1 > 0 , for the case where we are seeking tests matching criteral for all runs
+				  )))))))
+      (case qryvals
+	((shortlist)(map db:test-short-record->norm res))
+	((#f)       res)
+	(else       res)))))
 
 (define (db:test-short-record->norm inrec)
   ;;  "id,run_id,testname,item_path,state,status"
   ;;  "id,run_id,testname,state,status,event_time,host,cpuload,diskfree,uname,rundir,item_path,run_duration,final_logf,comment
   (vector (vector-ref inrec 0) ;; id