diff --git a/jOOQ/src/main/java/org/jooq/CacheContext.java b/jOOQ/src/main/java/org/jooq/CacheContext.java
index 9ec4d53249..6c79af1c2e 100644
--- a/jOOQ/src/main/java/org/jooq/CacheContext.java
+++ b/jOOQ/src/main/java/org/jooq/CacheContext.java
@@ -42,6 +42,13 @@ import org.jooq.impl.CacheType;
 /**
  * The parameter object passed to the
  * {@link CacheProvider#provide(CacheContext)} method.
+ * <p>
+ * This {@link Scope} is very short lived, for the duration of a cache
+ * implementation lookup of one of the various internal {@link CacheType}
+ * caches.
+ * <p>
+ * It does not live in the context of a parent {@link Scope}, and as such, does
+ * not have access to any {@link #data()} from another {@link Scope}.
  *
  * @author Lukas Eder
  */
diff --git a/jOOQ/src/main/java/org/jooq/CacheProvider.java b/jOOQ/src/main/java/org/jooq/CacheProvider.java
index 48d778fe19..e3854af76a 100644
--- a/jOOQ/src/main/java/org/jooq/CacheProvider.java
+++ b/jOOQ/src/main/java/org/jooq/CacheProvider.java
@@ -41,6 +41,8 @@ import java.util.Collections;
 import java.util.Map;
 import java.util.concurrent.ConcurrentMap;
 
+import org.jooq.impl.CacheType;
+
 import org.jetbrains.annotations.Nullable;
 
 /**
diff --git a/jOOQ/src/main/java/org/jooq/DSLContext.java b/jOOQ/src/main/java/org/jooq/DSLContext.java
index 11dea8e32d..13aad618cd 100644
--- a/jOOQ/src/main/java/org/jooq/DSLContext.java
+++ b/jOOQ/src/main/java/org/jooq/DSLContext.java
@@ -105,6 +105,7 @@ import org.jooq.exception.InvalidResultException;
 import org.jooq.exception.MappingException;
 import org.jooq.exception.NoDataFoundException;
 import org.jooq.exception.TooManyRowsException;
+import org.jooq.impl.CacheType;
 import org.jooq.impl.DSL;
 import org.jooq.impl.ParserException;
 import org.jooq.impl.ThreadLocalTransactionProvider;
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultCacheContext.java b/jOOQ/src/main/java/org/jooq/impl/DefaultCacheContext.java
index fcba9fbb66..32d29c52e2 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultCacheContext.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultCacheContext.java
@@ -38,7 +38,6 @@
 package org.jooq.impl;
 
 import org.jooq.CacheContext;
-import org.jooq.impl.CacheType;
 import org.jooq.Configuration;
 
 /**