diff --git a/substratevm/src/com.oracle.svm.hosted/resources/SharedLayerSnapshotCapnProtoSchema.capnp b/substratevm/src/com.oracle.svm.hosted/resources/SharedLayerSnapshotCapnProtoSchema.capnp
index 8b8c10e1a3b8..fdbbcccc278d 100644
--- a/substratevm/src/com.oracle.svm.hosted/resources/SharedLayerSnapshotCapnProtoSchema.capnp
+++ b/substratevm/src/com.oracle.svm.hosted/resources/SharedLayerSnapshotCapnProtoSchema.capnp
@@ -144,12 +144,13 @@ struct PersistedAnalysisField {
   isRead @9 :Bool;
   isWritten @10 :Bool;
   isFolded @11 :Bool;
-  isStatic @12 :Bool;
-  isSynthetic @13 :Bool;
-  annotationList @14 :List(Annotation);
-  name @15 :Text;
-  priorInstalledLayerNum @16 :Int32;
-  assignmentStatus @17 :Int32;
+  isUnsafeAccessed @12 :Bool;
+  isStatic @13 :Bool;
+  isSynthetic @14 :Bool;
+  annotationList @15 :List(Annotation);
+  name @16 :Text;
+  priorInstalledLayerNum @17 :Int32;
+  assignmentStatus @18 :Int32;
 }
 
 struct CEntryPointLiteralReference {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java
index f6318850a544..f1e0d950e8ce 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerLoader.java
@@ -1290,6 +1290,7 @@ public void initializeBaseLayerField(AnalysisField analysisField) {
             analysisField.registerAsWritten(PERSISTED);
         });
         registerFlag(fieldData.getIsFolded(), debug -> analysisField.registerAsFolded(PERSISTED));
+        registerFlag(fieldData.getIsUnsafeAccessed(), debug -> analysisField.registerAsUnsafeAccessed(PERSISTED));
     }
 
     private PersistedAnalysisField.Reader getFieldData(AnalysisField analysisField) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerWriter.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerWriter.java
index 0d470f5d6924..d30bc5451086 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerWriter.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SVMImageLayerWriter.java
@@ -664,6 +664,7 @@ private void persistField(AnalysisField field, Supplier<PersistedAnalysisField.B
         builder.setIsRead(field.getReadReason() != null);
         builder.setIsWritten(field.getWrittenReason() != null);
         builder.setIsFolded(field.getFoldedReason() != null);
+        builder.setIsUnsafeAccessed(field.isUnsafeAccessed());
 
         Field originalField = OriginalFieldProvider.getJavaField(field);
         if (originalField != null && !originalField.getDeclaringClass().equals(field.getDeclaringClass().getJavaClass())) {
diff --git a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SharedLayerSnapshotCapnProtoSchemaHolder.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SharedLayerSnapshotCapnProtoSchemaHolder.java
index a83fe5d68ec3..f386b74824d9 100644
--- a/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SharedLayerSnapshotCapnProtoSchemaHolder.java
+++ b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/imagelayer/SharedLayerSnapshotCapnProtoSchemaHolder.java
@@ -2170,20 +2170,27 @@ public final void setIsFolded(boolean value) {
         _setBooleanField(196, value);
       }
 
-      public final boolean getIsStatic() {
+      public final boolean getIsUnsafeAccessed() {
         return _getBooleanField(197);
       }
-      public final void setIsStatic(boolean value) {
+      public final void setIsUnsafeAccessed(boolean value) {
         _setBooleanField(197, value);
       }
 
-      public final boolean getIsSynthetic() {
+      public final boolean getIsStatic() {
         return _getBooleanField(198);
       }
-      public final void setIsSynthetic(boolean value) {
+      public final void setIsStatic(boolean value) {
         _setBooleanField(198, value);
       }
 
+      public final boolean getIsSynthetic() {
+        return _getBooleanField(199);
+      }
+      public final void setIsSynthetic(boolean value) {
+        _setBooleanField(199, value);
+      }
+
       public final boolean hasAnnotationList() {
         return !_pointerFieldIsNull(1);
       }
@@ -2283,14 +2290,18 @@ public final boolean getIsFolded() {
         return _getBooleanField(196);
       }
 
-      public final boolean getIsStatic() {
+      public final boolean getIsUnsafeAccessed() {
         return _getBooleanField(197);
       }
 
-      public final boolean getIsSynthetic() {
+      public final boolean getIsStatic() {
         return _getBooleanField(198);
       }
 
+      public final boolean getIsSynthetic() {
+        return _getBooleanField(199);
+      }
+
       public final boolean hasAnnotationList() {
         return !_pointerFieldIsNull(1);
       }