Index: /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java
===================================================================
--- /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java	(revision 31605)
+++ /applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/MemoryTileCache.java	(revision 31606)
@@ -54,5 +54,5 @@
         hash.put(tile.getKey(), entry);
         lruTiles.addFirst(entry);
-        if (hash.size() > cacheSize) {
+        if (hash.size() > cacheSize || lruTiles.getElementCount() > cacheSize) {
             removeOldEntries();
         }