diff --git a/platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotInputMappings.java b/platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotInputMappings.java
index 29da6692bce1..a4d4cd3dab18 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotInputMappings.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotInputMappings.java
@@ -193,8 +193,9 @@ public class SnapshotInputMappings<Key, Value> implements UpdatableSnapshotInput
     int hash = doGetContentHash((FileContentImpl)content);
     if (myCompositeHashIdEnumerator != null) {
       int subIndexerTypeId = mySubIndexerRetriever.getFileIndexerId(content);
-      return myCompositeHashIdEnumerator.enumerate(hash, subIndexerTypeId);
+      hash = myCompositeHashIdEnumerator.enumerate(hash, subIndexerTypeId);
     }
+
     return hash;
   }
 
diff --git a/platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotSingleValueIndexStorage.java b/platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotSingleValueIndexStorage.java
index 06cf0921fd2c..d70a1d105571 100644
--- a/platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotSingleValueIndexStorage.java
+++ b/platform/lang-impl/src/com/intellij/util/indexing/snapshot/SnapshotSingleValueIndexStorage.java
@@ -96,6 +96,7 @@ public class SnapshotSingleValueIndexStorage<Key, Value> implements VfsAwareInde
   public void addValue(Key key, int inputId, Value value) {
     assert myInitialized;
     checkKeyInputIdConsistency(key, inputId);
+    myCache.remove(key);
     // do nothing, all data update is served by forward index, the only one we need to serve here is read access
   }
 
@@ -103,6 +104,7 @@ public class SnapshotSingleValueIndexStorage<Key, Value> implements VfsAwareInde
   public void removeAllValues(@NotNull Key key, int inputId) {
     assert myInitialized;
     checkKeyInputIdConsistency(key, inputId);
+    myCache.remove(key);
     // do nothing, all data update is served by forward index, the only one we need to serve here is read access
   }