diff --git a/platform/ide-core/src/com/intellij/openapi/application/ApplicationBundle.java b/platform/ide-core/src/com/intellij/openapi/application/ApplicationBundle.java
index b0101aa2cbd0..8ffebab9148c 100644
--- a/platform/ide-core/src/com/intellij/openapi/application/ApplicationBundle.java
+++ b/platform/ide-core/src/com/intellij/openapi/application/ApplicationBundle.java
@@ -12,12 +12,11 @@ import java.util.function.Supplier;
 /**
  * Provides access to localized properties of the IntelliJ Platform.
  */
-public final class ApplicationBundle extends DynamicBundle {
+public final class ApplicationBundle {
   public static final String BUNDLE = "messages.ApplicationBundle";
-  public static final ApplicationBundle INSTANCE = new ApplicationBundle();
+  public static final DynamicBundle INSTANCE = new DynamicBundle(ApplicationBundle.class, BUNDLE);
 
   private ApplicationBundle() {
-    super(BUNDLE);
   }
 
   public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
diff --git a/plugins/package-search/gradle/src/com/jetbrains/packagesearch/intellij/plugin/gradle/GradlePackageUpdateInspection.kt b/plugins/package-search/gradle/src/com/jetbrains/packagesearch/intellij/plugin/gradle/GradlePackageUpdateInspection.kt
index 4d07bc123093..a6cfc8b94611 100644
--- a/plugins/package-search/gradle/src/com/jetbrains/packagesearch/intellij/plugin/gradle/GradlePackageUpdateInspection.kt
+++ b/plugins/package-search/gradle/src/com/jetbrains/packagesearch/intellij/plugin/gradle/GradlePackageUpdateInspection.kt
@@ -24,9 +24,10 @@ import com.jetbrains.packagesearch.intellij.plugin.gradle.GradlePackageVersionRa
 
 internal class GradlePackageUpdateInspection : PackageUpdateInspection() {
 
-    override fun getStaticDescription(): String = PackageSearchBundle.getMessage("packagesearch.inspection.upgrade.description.gradle")
-    override fun selectPsiElementIndex(dependencyDeclarationIndexes: DependencyDeclarationIndexes) =
-        dependencyDeclarationIndexes.coordinatesStartIndex
+    override fun getStaticDescription(): String = PackageSearchBundle.message("packagesearch.inspection.upgrade.description.gradle")
+    override fun selectPsiElementIndex(dependencyDeclarationIndexes: DependencyDeclarationIndexes): Int {
+        return dependencyDeclarationIndexes.coordinatesStartIndex
+    }
 
     override fun shouldCheckFile(file: PsiFile): Boolean =
         hasSupportFor(file)
diff --git a/plugins/package-search/gradle/src/com/jetbrains/packagesearch/intellij/plugin/gradle/GradlePackageVersionRangeInspection.kt b/plugins/package-search/gradle/src/com/jetbrains/packagesearch/intellij/plugin/gradle/GradlePackageVersionRangeInspection.kt
index 3944b5a7e279..7cfcd898c09f 100644
--- a/plugins/package-search/gradle/src/com/jetbrains/packagesearch/intellij/plugin/gradle/GradlePackageVersionRangeInspection.kt
+++ b/plugins/package-search/gradle/src/com/jetbrains/packagesearch/intellij/plugin/gradle/GradlePackageVersionRangeInspection.kt
@@ -25,7 +25,6 @@ import com.jetbrains.packagesearch.intellij.plugin.extensibility.ProjectModuleTy
 internal class GradlePackageVersionRangeInspection : PackageVersionRangeInspection() {
 
     companion object {
-
         private const val FILE_TYPE_GROOVY = "groovy"
         private const val FILE_TYPE_KOTLIN = "kotlin"
         private const val EXTENSION_GRADLE = "gradle"
@@ -46,10 +45,11 @@ internal class GradlePackageVersionRangeInspection : PackageVersionRangeInspecti
             projectModuleType is GradleProjectModuleType
     }
 
-    override fun getStaticDescription(): String = PackageSearchBundle.getMessage("packagesearch.inspection.range.description.gradle")
+    override fun getStaticDescription(): String = PackageSearchBundle.message("packagesearch.inspection.range.description.gradle")
 
-    override fun selectPsiElementIndex(dependencyDeclarationIndexes: DependencyDeclarationIndexes) =
-        dependencyDeclarationIndexes.coordinatesStartIndex
+    override fun selectPsiElementIndex(dependencyDeclarationIndexes: DependencyDeclarationIndexes): Int {
+        return dependencyDeclarationIndexes.coordinatesStartIndex
+    }
 
     override fun shouldCheckFile(file: PsiFile) = hasSupportFor(file)
 }
diff --git a/plugins/package-search/maven/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenPackageUpdateInspection.kt b/plugins/package-search/maven/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenPackageUpdateInspection.kt
index 734867cfab0b..518a9591a41e 100644
--- a/plugins/package-search/maven/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenPackageUpdateInspection.kt
+++ b/plugins/package-search/maven/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenPackageUpdateInspection.kt
@@ -24,10 +24,10 @@ import org.jetbrains.idea.maven.utils.MavenUtil
 
 internal class MavenPackageUpdateInspection : PackageUpdateInspection() {
 
-    override fun getStaticDescription(): String = PackageSearchBundle.getMessage("packagesearch.inspection.upgrade.description.maven")
-    override fun selectPsiElementIndex(dependencyDeclarationIndexes: DependencyDeclarationIndexes) =
-        dependencyDeclarationIndexes.versionStartIndex
+    override fun getStaticDescription(): String = PackageSearchBundle.message("packagesearch.inspection.upgrade.description.maven")
+    override fun selectPsiElementIndex(dependencyDeclarationIndexes: DependencyDeclarationIndexes): Int? {
+        return dependencyDeclarationIndexes.versionStartIndex
+    }
 
-    override fun shouldCheckFile(file: PsiFile) =
-        MavenUtil.isPomFile(file.project, file.virtualFile)
+    override fun shouldCheckFile(file: PsiFile) = MavenUtil.isPomFile(file.project, file.virtualFile)
 }
diff --git a/plugins/package-search/maven/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenPackageVersionRangeInspection.kt b/plugins/package-search/maven/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenPackageVersionRangeInspection.kt
index a4a3398059e2..ac2c2e5922cd 100644
--- a/plugins/package-search/maven/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenPackageVersionRangeInspection.kt
+++ b/plugins/package-search/maven/src/com/jetbrains/packagesearch/intellij/plugin/maven/MavenPackageVersionRangeInspection.kt
@@ -23,10 +23,10 @@ import com.jetbrains.packagesearch.intellij.plugin.extensibility.PackageVersionR
 import org.jetbrains.idea.maven.utils.MavenUtil
 
 internal class MavenPackageVersionRangeInspection : PackageVersionRangeInspection() {
-
-    override fun getStaticDescription(): String = PackageSearchBundle.getMessage("packagesearch.inspection.range.description.maven")
-    override fun selectPsiElementIndex(dependencyDeclarationIndexes: DependencyDeclarationIndexes) =
-        dependencyDeclarationIndexes.versionStartIndex
+    override fun getStaticDescription(): String = PackageSearchBundle.message("packagesearch.inspection.range.description.maven")
+    override fun selectPsiElementIndex(dependencyDeclarationIndexes: DependencyDeclarationIndexes): Int? {
+        return dependencyDeclarationIndexes.versionStartIndex
+    }
 
     override fun shouldCheckFile(file: PsiFile) = MavenUtil.isPomFile(file.project, file.virtualFile)
 }
diff --git a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/PackageSearchBundle.kt b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/PackageSearchBundle.kt
index 47b2578fc64f..1ac05512d4bf 100644
--- a/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/PackageSearchBundle.kt
+++ b/plugins/package-search/src/com/jetbrains/packagesearch/intellij/plugin/PackageSearchBundle.kt
@@ -19,19 +19,14 @@ package com.jetbrains.packagesearch.intellij.plugin
 import com.intellij.DynamicBundle
 import org.jetbrains.annotations.Nls
 import org.jetbrains.annotations.PropertyKey
-import java.util.function.Supplier
 
-private const val BUNDLE_NAME = "messages.packageSearchBundle"
-
-object PackageSearchBundle : DynamicBundle(BUNDLE_NAME) {
+private const val BUNDLE = "messages.packageSearchBundle"
 
+object PackageSearchBundle {
+    private val bundle = DynamicBundle(PackageSearchBundle::class.java, BUNDLE)
     @Nls
     fun message(
-        @PropertyKey(resourceBundle = BUNDLE_NAME) key: String,
+        @PropertyKey(resourceBundle = BUNDLE) key: String,
         vararg params: Any
-    ): String = getMessage(key, *params)
-
-    @Nls
-    fun messagePointer(@PropertyKey(resourceBundle = BUNDLE_NAME) key: String, vararg params: Any): Supplier<String> =
-        getLazyMessage(key, *params)
+    ): String = bundle.getMessage(key, *params)
 }
\ No newline at end of file