@@ -28,10 +28,11 @@
 
 (define home (getenv "HOME"))
 (define user (getenv "USER"))
 
 ;; global gletches
+(define *db-keys* #f)
 (define *configinfo* #f)
 (define *configdat*  #f)
 (define *toppath*    #f)
 (define *already-seen-runconfig-info* #f)
 (define *waiting-queue*     (make-hash-table))
@@ -40,11 +41,13 @@
 (define *passnum*           0) ;; when running track calls to run-tests or similar
 (define *verbosity*         1)
 (define *rpc:listener*      #f) ;; if set up for server communication this will hold the tcp port
 (define *runremote*         #f) ;; if set up for server communication this will hold <host port>
 (define *last-db-access*    0)  ;; update when db is accessed via server
-(define *target*            #f) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
+(define *target*            (make-hash-table)) ;; cache the target here; target is keyval1/keyval2/.../keyvalN
+(define *keys*              (make-hash-table)) ;; cache the keys here
+(define *keyvals*           (make-hash-table))
 (define *toptest-paths*     (make-hash-table)) ;; cache toptest path settings here
 (define *run-info-cache* (make-hash-table)) ;; run info is stable, no need to reget
 
 (define (get-with-default val default)
   (let ((val (args:get-arg val)))