diff --git a/repository-ydb-v1/src/main/java/tech/ydb/yoj/repository/ydb/table/YdbTable.java b/repository-ydb-v1/src/main/java/tech/ydb/yoj/repository/ydb/table/YdbTable.java
index ae58f271..5b343ae4 100644
--- a/repository-ydb-v1/src/main/java/tech/ydb/yoj/repository/ydb/table/YdbTable.java
+++ b/repository-ydb-v1/src/main/java/tech/ydb/yoj/repository/ydb/table/YdbTable.java
@@ -9,6 +9,7 @@
 import tech.ydb.yoj.databind.expression.OrderExpression;
 import tech.ydb.yoj.repository.db.Entity;
 import tech.ydb.yoj.repository.db.Entity.Id;
+import tech.ydb.yoj.repository.db.EntityDescription;
 import tech.ydb.yoj.repository.db.EntityIdSchema;
 import tech.ydb.yoj.repository.db.EntitySchema;
 import tech.ydb.yoj.repository.db.Range;
@@ -57,6 +58,7 @@ public class YdbTable<T extends Entity<T>> implements Table<T> {
     private final QueryExecutor executor;
     @Getter
     private final Class<T> type;
+    private final EntityDescription<T> desc;
 
     public YdbTable(Class<T> type, QueryExecutor executor) {
         this.type = type;
diff --git a/repository/src/main/java/tech/ydb/yoj/repository/db/EntityDescription.java b/repository/src/main/java/tech/ydb/yoj/repository/db/EntityDescription.java
new file mode 100644
index 00000000..058f57a2
--- /dev/null
+++ b/repository/src/main/java/tech/ydb/yoj/repository/db/EntityDescription.java
@@ -0,0 +1,7 @@
+package tech.ydb.yoj.repository.db;
+
+public record EntityDescription<E extends Entity<E>>(
+        Class<E> entityCls,
+        String tableName
+) {
+}
diff --git a/repository/src/main/java/tech/ydb/yoj/repository/db/Repository.java b/repository/src/main/java/tech/ydb/yoj/repository/db/Repository.java
index f7b44ca6..02a1485b 100644
--- a/repository/src/main/java/tech/ydb/yoj/repository/db/Repository.java
+++ b/repository/src/main/java/tech/ydb/yoj/repository/db/Repository.java
@@ -14,6 +14,8 @@ default void checkSchemaCompatibility() {
 
     <T extends Entity<T>> SchemaOperations<T> schema(Class<T> c);
 
+    <T extends Entity<T>> SchemaOperations<T> schema(EntityDescription<T> c);
+
     /**
      * @deprecated For testing purposes only. Will only <em>reliably</em> work for tables that were created or inspected
      * using calls to {@link #schema(Class)}.
diff --git a/repository/src/main/java/tech/ydb/yoj/repository/db/RepositoryTransaction.java b/repository/src/main/java/tech/ydb/yoj/repository/db/RepositoryTransaction.java
index 112f9c8c..737d2d59 100644
--- a/repository/src/main/java/tech/ydb/yoj/repository/db/RepositoryTransaction.java
+++ b/repository/src/main/java/tech/ydb/yoj/repository/db/RepositoryTransaction.java
@@ -10,6 +10,8 @@
 public interface RepositoryTransaction {
     <T extends Entity<T>> Table<T> table(Class<T> c);
 
+    <T extends Entity<T>> Table<T> table(EntityDescription<T> c);
+
     /**
      * Commits the transaction or throws exception. Note that this method is not expected to be called, if the last
      * transaction statement has thrown an exception, because it means that transaction didn't 'execute normally'.
diff --git a/repository/src/main/java/tech/ydb/yoj/repository/db/cache/FirstLevelCache.java b/repository/src/main/java/tech/ydb/yoj/repository/db/cache/FirstLevelCache.java
index fd261331..49305ea2 100644
--- a/repository/src/main/java/tech/ydb/yoj/repository/db/cache/FirstLevelCache.java
+++ b/repository/src/main/java/tech/ydb/yoj/repository/db/cache/FirstLevelCache.java
@@ -3,6 +3,7 @@
 import com.google.common.collect.Maps;
 import lombok.NonNull;
 import tech.ydb.yoj.repository.db.Entity;
+import tech.ydb.yoj.repository.db.EntityDescription;
 
 import java.util.Collections;
 import java.util.ConcurrentModificationException;
@@ -16,15 +17,19 @@
 
 
 public interface FirstLevelCache {
-    <E extends Entity<E>> E get(@NonNull Entity.Id<E> id, @NonNull Function<Entity.Id<E>, E> loader);
+    <E extends Entity<E>> E get(
+            @NonNull EntityDescription<E> desc,
+            @NonNull Entity.Id<E> id,
+            @NonNull Function<Entity.Id<E>, E> loader
+    );
 
-    <E extends Entity<E>> Optional<E> peek(@NonNull Entity.Id<E> id);
+    <E extends Entity<E>> Optional<E> peek(@NonNull EntityDescription<E> desc, @NonNull Entity.Id<E> id);
 
     /**
      * Returns a immutable copy of the entities of {@code entityType} type that are in the
      * transaction L1 cache.
      */
-    <E extends Entity<E>> List<E> snapshot(@NonNull Class<E> entityType);
+    <E extends Entity<E>> List<E> snapshot(@NonNull EntityDescription<E> desc);
 
     /**
      * Returns a unmodifiable map containing the entities of {@code entityType} type that are in the
@@ -32,13 +37,13 @@ public interface FirstLevelCache {
      * changes to second affect the first. To avoid an {@link ConcurrentModificationException} exception
      * when iterating and simultaneous modification of the transaction L1 cache, you may need to make a copy.
      */
-    <E extends Entity<E>> Map<Entity.Id<E>, E> entities(@NonNull Class<E> entityType);
+    <E extends Entity<E>> Map<Entity.Id<E>, E> entities(@NonNull EntityDescription<E> desc);
 
-    <E extends Entity<E>> void put(@NonNull E e);
+    <E extends Entity<E>> void put(@NonNull EntityDescription<E> desc, @NonNull E e);
 
-    <E extends Entity<E>> void putEmpty(@NonNull Entity.Id<E> id);
+    <E extends Entity<E>> void putEmpty(@NonNull EntityDescription<E> desc, @NonNull Entity.Id<E> id);
 
-    <E extends Entity<E>> boolean containsKey(@NonNull Entity.Id<E> id);
+    <E extends Entity<E>> boolean containsKey(@NonNull EntityDescription<E> desc, @NonNull Entity.Id<E> id);
 
     static FirstLevelCache empty() {
         return new FirstLevelCache() {
diff --git a/repository/src/main/java/tech/ydb/yoj/repository/db/projection/ProjectionCache.java b/repository/src/main/java/tech/ydb/yoj/repository/db/projection/ProjectionCache.java
index b72f1eec..0c3fb981 100644
--- a/repository/src/main/java/tech/ydb/yoj/repository/db/projection/ProjectionCache.java
+++ b/repository/src/main/java/tech/ydb/yoj/repository/db/projection/ProjectionCache.java
@@ -2,14 +2,15 @@
 
 
 import tech.ydb.yoj.repository.db.Entity;
+import tech.ydb.yoj.repository.db.EntityDescription;
 import tech.ydb.yoj.repository.db.RepositoryTransaction;
 
 public interface ProjectionCache {
-    void load(Entity<?> entity);
+    <E extends Entity<E>> void load(EntityDescription<E> desc, Entity<?> entity);
 
-    void save(Entity<?> entity);
+    <E extends Entity<E>> void save(EntityDescription<E> desc, Entity<?> entity);
 
-    void delete(Entity.Id<?> id);
+    <E extends Entity<E>> void delete(EntityDescription<E> desc, Entity.Id<?> id);
 
     void applyProjectionChanges(RepositoryTransaction transaction);
 }