diff --git a/src/program_state.cpp b/src/program_state.cpp
index 3eba84f12e..fab71b1def 100644
--- a/src/program_state.cpp
+++ b/src/program_state.cpp
@@ -444,7 +444,9 @@ const unordered_map<uintptr_t, vector<pair<hsa_agent_t, Kernel_descriptor>>>& fu
 
     auto cons = [rebuild]() {
         if (rebuild) {
-            r.clear();
+            // do NOT clear r so we reuse instances of pair<hsa_agent_t, Kernel_descriptor>
+            // created previously
+
             function_names(rebuild);
             kernels(rebuild);
             globals(rebuild);