diff --git a/platform/core-api/src/com/intellij/psi/util/CachedValue.java b/platform/core-api/src/com/intellij/psi/util/CachedValue.java
index 370084c9a46b..309232baee31 100644
--- a/platform/core-api/src/com/intellij/psi/util/CachedValue.java
+++ b/platform/core-api/src/com/intellij/psi/util/CachedValue.java
@@ -15,10 +15,13 @@
  */
 package com.intellij.psi.util;
 
+import org.jetbrains.annotations.NotNull;
+
 public interface CachedValue<T> {
 
   T getValue();
 
+  @NotNull
   CachedValueProvider<T> getValueProvider();
 
   boolean hasUpToDateValue();
diff --git a/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValueImpl.java b/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValueImpl.java
index f854f72da6ee..90ef17aaeab4 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValueImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/PsiCachedValueImpl.java
@@ -19,6 +19,7 @@ package com.intellij.psi.impl;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.util.CachedValue;
 import com.intellij.psi.util.CachedValueProvider;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -27,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
 public class PsiCachedValueImpl<T> extends PsiCachedValue<T> implements CachedValue<T>  {
   private final CachedValueProvider<T> myProvider;
 
-  public PsiCachedValueImpl(PsiManager manager, CachedValueProvider<T> provider) {
+  public PsiCachedValueImpl(@NotNull PsiManager manager, @NotNull CachedValueProvider<T> provider) {
     super(manager);
     myProvider = provider;
   }
@@ -37,6 +38,7 @@ public class PsiCachedValueImpl<T> extends PsiCachedValue<T> implements CachedVa
     return getValueWithLock(null);
   }
 
+  @NotNull
   @Override
   public CachedValueProvider<T> getValueProvider() {
     return myProvider;
diff --git a/platform/core-impl/src/com/intellij/util/CachedValueImpl.java b/platform/core-impl/src/com/intellij/util/CachedValueImpl.java
index 4345ccd48253..9af99b876cac 100644
--- a/platform/core-impl/src/com/intellij/util/CachedValueImpl.java
+++ b/platform/core-impl/src/com/intellij/util/CachedValueImpl.java
@@ -40,6 +40,7 @@ public abstract class CachedValueImpl<T> extends CachedValueBase<T> implements C
     return myProvider.compute();
   }
 
+  @NotNull
   @Override
   public CachedValueProvider<T> getValueProvider() {
     return myProvider;