diff --git a/src/main/java/no/rutebanken/anshar/data/SiriRepository.java b/src/main/java/no/rutebanken/anshar/data/SiriRepository.java
index 8d0d27285..8c1ab2938 100644
--- a/src/main/java/no/rutebanken/anshar/data/SiriRepository.java
+++ b/src/main/java/no/rutebanken/anshar/data/SiriRepository.java
@@ -159,7 +159,7 @@ protected void enableCache(IMap<SiriObjectStorageKey, T> map, java.util.function
      * @param map
      * @param linkedMaps
      */
-    void linkEntriesTtl(IMap<SiriObjectStorageKey, T> map,  IMap<String, Set<SiriObjectStorageKey>> linkedChangeMap, Map<SiriObjectStorageKey, ? extends Object>... linkedMaps) {
+    void linkEntriesTtl(IMap<SiriObjectStorageKey, T> map,  IMap<String, Set<SiriObjectStorageKey>> linkedChangeMap, IMap<SiriObjectStorageKey, ? extends Object>... linkedMaps) {
         {
 
             // Entry added - new data
@@ -189,9 +189,9 @@ void linkEntriesTtl(IMap<SiriObjectStorageKey, T> map,  IMap<String, Set<SiriObj
         }
     }
 
-    private void removeFromLinked(IMap<String, Set<SiriObjectStorageKey>> linkedChangeMap, EntryEvent<SiriObjectStorageKey, T> entryEvent, Map<SiriObjectStorageKey, ?>[] linkedMaps) {
-        for (Map<SiriObjectStorageKey, ?> linkedMap : linkedMaps) {
-            linkedMap.remove(entryEvent.getKey());
+    private void removeFromLinked(IMap<String, Set<SiriObjectStorageKey>> linkedChangeMap, EntryEvent<SiriObjectStorageKey, T> entryEvent, IMap<SiriObjectStorageKey, ?>[] linkedMaps) {
+        for (IMap<SiriObjectStorageKey, ?> linkedMap : linkedMaps) {
+            linkedMap.removeAsync(entryEvent.getKey());
         }
         for (Set<SiriObjectStorageKey> changes : linkedChangeMap.values()) {
             changes.remove(entryEvent.getKey());