diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
index 5b001857f5a..5de1a7c52b6 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirClassDeclaredMemberScope.kt
@@ -38,6 +38,7 @@ class FirMemberScopeProvider : FirSessionComponent {
         }
     }
 
+    // TODO: it's better to cache this scope in ScopeSession
     fun selfImportingScope(fqName: FqName, session: FirSession): FirSelfImportingScope {
         return selfImportingCache.getOrPut(fqName) {
             FirSelfImportingScope(fqName, session)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLazyNestedClassifierScope.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLazyNestedClassifierScope.kt
index 699362793f0..8227bdb4a1a 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLazyNestedClassifierScope.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirLazyNestedClassifierScope.kt
@@ -13,6 +13,9 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirClassifierSymbol
 import org.jetbrains.kotlin.name.ClassId
 import org.jetbrains.kotlin.name.Name
 
+// TODO: we could get rid of this scope and use FirNestedClassifierScope instead,
+// but in this case we should make JavaSymbolProvider greedy related to nested classifiers
+// (or make possible to calculate nested classifiers on-the-fly)
 class FirLazyNestedClassifierScope(
     val classId: ClassId,
     session: FirSession