diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java
index 2460cccbdca..2b29dff9834 100644
--- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalLazyCachesTestGenerated.java
@@ -71,4 +71,10 @@ public class IncrementalLazyCachesTestGenerated extends AbstractIncrementalLazyC
         doTest(fileName);
     }
 
+    @TestMetadata("topLevelPropertyAccess")
+    public void testTopLevelPropertyAccess() throws Exception {
+        String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/");
+        doTest(fileName);
+    }
+
 }
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log
index b539afde438..b9269ba28f4 100644
--- a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log
+++ b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/build.log
@@ -7,8 +7,10 @@ src/constant.kt
 End of files
 Cleaning output files:
 out/production/module/META-INF/module.kotlin_module
+out/production/module/constant/ConstantKt.class
 out/production/module/usage/UsageKt.class
 End of files
 Compiling files:
+src/constant.kt
 src/usage.kt
 End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt
index 5bb00251bf3..d86254c6145 100644
--- a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt
+++ b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt
@@ -1,3 +1,3 @@
 package constant
 
-val X = 10
\ No newline at end of file
+const val X = 10
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new
index 922484aea23..e068bc3b724 100644
--- a/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new
+++ b/jps-plugin/testData/incremental/lazyKotlinCaches/constant/constant.kt.new
@@ -1,3 +1,3 @@
 package constant
 
-val X = 11
\ No newline at end of file
+const val X = 11
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log
new file mode 100644
index 00000000000..2914423d765
--- /dev/null
+++ b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/build.log
@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/META-INF/module.kotlin_module
+out/production/module/constant/ConstantKt.class
+End of files
+Compiling files:
+src/constant.kt
+End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt
new file mode 100644
index 00000000000..5bb00251bf3
--- /dev/null
+++ b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt
@@ -0,0 +1,3 @@
+package constant
+
+val X = 10
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new
new file mode 100644
index 00000000000..922484aea23
--- /dev/null
+++ b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/constant.kt.new
@@ -0,0 +1,3 @@
+package constant
+
+val X = 11
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt
new file mode 100644
index 00000000000..89837f47189
--- /dev/null
+++ b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/expected-kotlin-caches.txt
@@ -0,0 +1,6 @@
+Module 'module' production
+    format-version.txt
+    package-parts.tab
+    proto.tab
+    source-to-classes.tab
+Module 'module' tests
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt
new file mode 100644
index 00000000000..4a70ee33065
--- /dev/null
+++ b/jps-plugin/testData/incremental/lazyKotlinCaches/topLevelPropertyAccess/usage.kt
@@ -0,0 +1,4 @@
+package usage
+
+fun f(): Int =
+        constant.X
\ No newline at end of file