diff --git a/src/racket/src/portfun.c b/src/racket/src/portfun.c
index 3d2a098f54..fc31a5deea 100644
--- a/src/racket/src/portfun.c
+++ b/src/racket/src/portfun.c
@@ -4136,7 +4136,9 @@ static Scheme_Object *do_load_handler(void *data)
 
     if (obj) {
       /* CERT-INSP-CACHE <- grep for that in read.c */
-      obj = scheme_make_pair(obj, scheme_get_param(config, MZCONFIG_CODE_INSPECTOR));
+      obj = scheme_make_pair(obj, 
+                             scheme_make_pair(scheme_get_param(config, MZCONFIG_LOAD_DIRECTORY),
+                                              scheme_get_param(config, MZCONFIG_CODE_INSPECTOR)));
       obj = scheme_lookup_in_table(scheme_module_code_cache, (const char *)obj);
       if (obj)
         obj = scheme_ephemeron_value(obj);
diff --git a/src/racket/src/read.c b/src/racket/src/read.c
index b061f2be0b..89a1017c65 100644
--- a/src/racket/src/read.c
+++ b/src/racket/src/read.c
@@ -5599,7 +5599,7 @@ static Scheme_Object *read_compiled(Scheme_Object *port,
              inspector is the same, but maybe certificates can be
              fixed and this hack son't be necessary one day. Grep for
              CERT-INSP-CACHE elsewhere for other places to change. */
-          hc = scheme_make_pair(hc, insp);
+          hc = scheme_make_pair(hc, scheme_make_pair(dir, insp));
 
           m->code_key = hc;
         }