diff --git a/rocclr/device/devprogram.cpp b/rocclr/device/devprogram.cpp
index 584774a72f..374ad2315b 100644
--- a/rocclr/device/devprogram.cpp
+++ b/rocclr/device/devprogram.cpp
@@ -1427,6 +1427,15 @@ bool Program::initBuild(amd::option::Options* options) {
     return false;
   }
 
+  if (!amd::IS_HIP) {
+    std::string targetID = device().isa().targetId();
+#if defined(_WIN32)
+    // Replace special charaters that are not supported by Windows FS.
+    std::replace(targetID.begin(), targetID.end(), ':', '@');
+#endif
+    options->setPerBuildInfo(targetID.c_str(), clBinary()->getEncryptCode(), true);
+  }
+
   // Elf Binary setup
   std::string outFileName;
   bool tempFile = false;