diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java
new file mode 100644
index 0000000000..044b005db3
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/inheritance/SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.java
@@ -0,0 +1,131 @@
+package org.hibernate.orm.test.inheritance;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import org.hibernate.testing.TestForIssue;
+import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
+import org.hibernate.testing.orm.junit.Jpa;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Inheritance;
+import jakarta.persistence.InheritanceType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.SharedCacheMode;
+import jakarta.persistence.criteria.CriteriaQuery;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hibernate.orm.test.inheritance.SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.Cheese;
+import static org.hibernate.orm.test.inheritance.SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.SpecialCheese;
+import static org.hibernate.orm.test.inheritance.SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest.Hole;
+
+@Jpa(
+		annotatedClasses = {
+				Cheese.class,
+				SpecialCheese.class,
+				Hole.class
+		},
+		sharedCacheMode = SharedCacheMode.ALL
+)
+@TestForIssue(jiraKey = "HHH-15840")
+public class SingleTableInheritanceWithShareCacheModeAllAndCacheConcurrencyStrategyTest {
+
+	@BeforeAll
+	public void setUp(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					Cheese cheese = new Cheese();
+					entityManager.persist( cheese );
+
+					Hole hole = new Hole();
+					hole.setCheese( cheese );
+					entityManager.persist( hole );
+				}
+		);
+	}
+
+	@Test
+	public void testLoadingFromCache(EntityManagerFactoryScope scope) {
+		scope.inTransaction(
+				entityManager -> {
+					CriteriaQuery<Cheese> criteria = entityManager.getCriteriaBuilder().createQuery( Cheese.class );
+					List<Cheese> cheeses = entityManager.createQuery( criteria.select( criteria.from( Cheese.class ) ) )
+							.getResultList();
+					assertThat( cheeses.size() ).isEqualTo( 1 );
+					assertThat( cheeses.get( 0 ).getHoles().size() ).isEqualTo( 1 );
+				}
+		);
+
+		scope.inTransaction(
+				entityManager -> {
+					CriteriaQuery<Cheese> criteria = entityManager.getCriteriaBuilder().createQuery( Cheese.class );
+					List<Cheese> cheeses = entityManager.createQuery( criteria.select( criteria.from( Cheese.class ) ) )
+							.getResultList();
+					assertThat( cheeses.size() ).isEqualTo( 1 );
+					assertThat( cheeses.get( 0 ).getHoles().size() ).isEqualTo( 1 );
+				}
+		);
+	}
+
+	@Entity(name = "Cheese")
+	@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
+	public static class Cheese {
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "id_sequence")
+		private Long id;
+
+		private String name;
+
+		@OneToMany(mappedBy = "cheese", fetch = FetchType.LAZY)
+		@Cache(usage = CacheConcurrencyStrategy.TRANSACTIONAL)
+		private List<Hole> holes = new ArrayList<>();
+
+		public List<Hole> getHoles() {
+			return holes;
+		}
+
+		public void addHole(Hole hole) {
+			this.holes.add( hole );
+		}
+	}
+
+	@Entity(name = "SpecialCheese")
+	public static class SpecialCheese extends Cheese {
+	}
+
+	@Entity(name = "Hole")
+	public static class Hole {
+		@Id
+		@GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "id_sequence")
+		private Long id;
+
+		@Column(name = "SIZE_COLUMN")
+		private int size;
+
+		@ManyToOne(fetch = FetchType.LAZY, optional = false)
+		@JoinColumn(name = "cheese", nullable = false)
+		private Cheese cheese;
+
+		public Cheese getCheese() {
+			return cheese;
+		}
+
+		public void setCheese(Cheese cheese) {
+			this.cheese = cheese;
+			cheese.addHole( this );
+		}
+	}
+
+}