diff --git a/gui/cachingImageList.py b/gui/cachingImageList.py
index 39d4c91eb..d0549090c 100755
--- a/gui/cachingImageList.py
+++ b/gui/cachingImageList.py
@@ -21,14 +21,19 @@ import wx
 import bitmapLoader
 
 class CachingImageList(wx.ImageList):
-    def __init__(self):
+    def __init__(self, width, height):
+        wx.ImageList.__init__(self, width, height)
         self.map = {}
 
     def Add(self, *loaderArgs):
-        id = self.map.get(loaderArgs)
-        if id is None:
+        key = "".join(loaderArgs)
+        if key not in self.map:
             bitmap = bitmapLoader.getBitmap(*loaderArgs)
-            id = wx.ImageList.Add(bitmap)
-            self.map[loaderArgs] = id
+            if bitmap is None:
+                return -1
+            id = wx.ImageList.Add(self,bitmap)
+            self.map[key] = id
+        else:
+            id = self.map[key]
 
         return id
diff --git a/gui/marketBrowser.py b/gui/marketBrowser.py
index f0f21d74a..db859f002 100644
--- a/gui/marketBrowser.py
+++ b/gui/marketBrowser.py
@@ -23,6 +23,7 @@ import wx.lib.newevent
 import service
 import bitmapLoader
 import gui.mainFrame
+from gui.cachingImageList import CachingImageList
 from gui.contextMenu import ContextMenu
 
 ItemSelected, ITEM_SELECTED = wx.lib.newevent.NewEvent()
@@ -84,10 +85,10 @@ class MarketBrowser(wx.Panel):
 
         self.marketRoot = self.marketView.AddRoot("Market")
 
-        self.marketImageList = wx.ImageList(16, 16)
+        self.marketImageList = CachingImageList(16, 16)
         self.marketView.SetImageList(self.marketImageList)
 
-        self.itemImageList = wx.ImageList(16, 16)
+        self.itemImageList = CachingImageList(16, 16)
         self.itemView.SetImageList(self.itemImageList, wx.IMAGE_LIST_SMALL)
 
         cMarket = service.Market.getInstance()
@@ -131,20 +132,14 @@ class MarketBrowser(wx.Panel):
     def addMarketViewImage(self, iconFile):
         if iconFile is None:
             return -1
-        bitmap = bitmapLoader.getBitmap(iconFile, "pack")
-        if bitmap is None:
-            return -1
-        else:
-            return self.marketImageList.Add(bitmap)
+
+        return self.marketImageList.Add(iconFile, "pack")
 
     def addItemViewImage(self, iconFile):
         if iconFile is None:
             return -1
-        bitmap = bitmapLoader.getBitmap(iconFile, "pack")
-        if bitmap is None:
-            return -1
-        else:
-            return self.itemImageList.Add(bitmap)
+        
+        return self.itemImageList.Add(iconFile, "pack")
 
     def expandLookup(self, event):
         root = event.Item
@@ -166,7 +161,6 @@ class MarketBrowser(wx.Panel):
 
     def selectionMade(self, event):
         self.itemView.DeleteAllItems()
-        self.itemImageList.RemoveAll()
 
         if self.searching:
             self.clearSearch(None, False)
@@ -240,7 +234,6 @@ class MarketBrowser(wx.Panel):
         cMarket.searchItems(search, self.populateSearch)
 
     def clearSearch(self, event, clear=True):
-        self.itemImageList.RemoveAll()
         self.itemView.DeleteAllItems()
         if clear:
             self.search.Clear()
@@ -279,7 +272,6 @@ class MarketBrowser(wx.Panel):
 
         self.itemView.Freeze()
         self.itemView.DeleteAllItems()
-        self.itemImageList.RemoveAll()
 
         idNameMap = {}
         idGroupMap = {}