Moved the cached destination removal outside the for loop.
Since updateCache is a LinkedHashMap with accessOrder=true, a simple access with updateCache.get() modify the map. By iterating over updateCache.entrySet(), we avoid this update.
Issue: SPR-11755
Comment From: rstoyanchev
This is merged thanks.