diff --git a/platform/workspace/codegen-impl/gradle.properties b/platform/workspace/codegen-impl/gradle.properties
index 8a0576147631..ac9fffcbdb93 100644
--- a/platform/workspace/codegen-impl/gradle.properties
+++ b/platform/workspace/codegen-impl/gradle.properties
@@ -1,3 +1,3 @@
-codegenImplMinorVersion = 22
+codegenImplMinorVersion = 23
 codegenImplMajorVersion = 5
 codegenApiVersion = 3
\ No newline at end of file
diff --git a/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/StorageConsts.kt b/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/StorageConsts.kt
index 04c9e8325eb0..b03f3a4049ef 100644
--- a/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/StorageConsts.kt
+++ b/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/StorageConsts.kt
@@ -48,10 +48,11 @@ internal val MutableEntityStorage = fqn(workspaceStoragePackageName, "MutableEnt
 internal val EntityStorageInstrumentation = fqn(workspaceStorageInstrumentationPackageName, "EntityStorageInstrumentation")
 internal val MutableEntityStorageInstrumentation = fqn(workspaceStorageInstrumentationPackageName, "MutableEntityStorageInstrumentation")
 internal val EntityStorageInstrumentationApi = fqn(workspaceStorageInstrumentationPackageName, "EntityStorageInstrumentationApi")
+internal val WorkspaceEntityInternalApi = fqn(workspaceStoragePackageName, "WorkspaceEntityInternalApi")
 
 
 internal val EntityType = fqn(workspaceStoragePackageName, "EntityType")
-internal val ConnectionId = fqn(workspaceStorageImplPackageName, "ConnectionId")
+internal val ConnectionId = fqn(workspaceStoragePackageName, "ConnectionId")
 internal val EntityLink = fqn(workspaceStorageImplPackageName, "EntityLink")
 internal val WorkspaceEntityBase = fqn(workspaceStorageImplPackageName, "WorkspaceEntityBase")
 internal val SoftLinkable = fqn(workspaceStorageImplPackageName, "SoftLinkable")
diff --git a/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsDataClassCode.kt b/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsDataClassCode.kt
index a563eccc4fde..2b5c17dee195 100644
--- a/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsDataClassCode.kt
+++ b/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsDataClassCode.kt
@@ -28,6 +28,7 @@ fun ObjClass<*>.implWsDataClassCode(): String {
   val hasSoftLinks = hasSoftLinks()
   val softLinkable = if (hasSoftLinks) SoftLinkable else null
   return lines {
+    line("@OptIn($WorkspaceEntityInternalApi::class)")
     section("internal class $javaDataName : ${sups(entityDataBaseClass, softLinkable?.encodedString)}") label@{
 
       listNl(allFields.noRefs().noEntitySource().noSymbolicId()) { implWsDataFieldCode }
diff --git a/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsEntityClassCode.kt b/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsEntityClassCode.kt
index 1d6399206e8a..aea1876b8e42 100644
--- a/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsEntityClassCode.kt
+++ b/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsEntityClassCode.kt
@@ -21,6 +21,7 @@ fun ObjClass<*>.implWsEntityCode(): String {
 package ${module.implPackage}    
 
 ${implWsEntityAnnotations}
+@OptIn($WorkspaceEntityInternalApi::class)
 internal $inheritanceModifier class $javaImplName(private val dataSource: $javaDataName): $javaFullName, ${WorkspaceEntityBase}(dataSource) {
     ${
     """
diff --git a/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsMetadataStorageClassCode.kt b/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsMetadataStorageClassCode.kt
index c97a601aaf3e..c72b8746c299 100644
--- a/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsMetadataStorageClassCode.kt
+++ b/platform/workspace/codegen-impl/src/main/kotlin/com/intellij/workspaceModel/codegen/impl/writer/classes/implWsMetadataStorageClassCode.kt
@@ -14,6 +14,7 @@ internal fun implWsMetadataStorageCode(module: CompiledObjModule, types: List<Ob
                                        abstractTypes: List<ValueType.AbstractClass<*>>): String = lines {
   line("package ${module.implPackage}")
   line()
+  line("@OptIn($WorkspaceEntityInternalApi::class)")
   section("internal object ${MetadataStorage.IMPL_NAME}: ${MetadataStorage.base}()") {
     val builtTypes: MutableList<String> = arrayListOf()
     val builtPrimitiveTypes = linkedSetOf<BuiltPrimitiveType>()
@@ -64,6 +65,7 @@ internal fun implWsMetadataStorageCode(module: CompiledObjModule, types: List<Ob
 internal fun CompiledObjModule.implWsMetadataStorageBridgeCode(metadataStorageImpl: QualifiedName): String = lines {
   line("package ${this@implWsMetadataStorageBridgeCode.implPackage}")
   line()
+  line("@OptIn($WorkspaceEntityInternalApi::class)")
   line("internal object ${MetadataStorage.IMPL_NAME}: ${MetadataStorage.bridge}($metadataStorageImpl)")
 }