Index: channels/modarchive.py
==================================================================
--- channels/modarchive.py
+++ channels/modarchive.py
@@ -29,20 +29,10 @@
 from config import __print__, dbg
 
 
 
 
-
-
-
-
-
-
-
-
-
-
 # MODs
 class modarchive (ChannelPlugin):
 
     # description
     title = "modarchive"
@@ -52,12 +42,10 @@
     titles = dict(genre="Genre", title="Song", playing="File", listeners="Rating", bitrate=0)
 
     # keeps category titles->urls    
     catmap = {"Chiptune": "54", "Electronic - Ambient": "2", "Electronic - Other": "100", "Rock (general)": "13", "Trance - Hard": "64", "Swing": "75", "Rock - Soft": "15", "R & B": "26", "Big Band": "74", "Ska": "24", "Electronic - Rave": "65", "Electronic - Progressive": "11", "Piano": "59", "Comedy": "45", "Christmas": "72", "Chillout": "106", "Reggae": "27", "Electronic - Industrial": "34", "Grunge": "103", "Medieval": "28", "Demo Style": "55", "Orchestral": "50", "Soundtrack": "43", "Electronic - Jungle": "60", "Fusion": "102", "Electronic - IDM": "99", "Ballad": "56", "Country": "18", "World": "42", "Jazz - Modern": "31", "Video Game": "8", "Funk": "32", "Electronic - Drum & Bass": "6", "Alternative": "48", "Electronic - Minimal": "101", "Electronic - Gabber": "40", "Vocal Montage": "76", "Metal (general)": "36", "Electronic - Breakbeat": "9", "Soul": "25", "Electronic (general)": "1", "Punk": "35", "Pop - Synth": "61", "Electronic - Dance": "3", "Pop (general)": "12", "Trance - Progressive": "85", "Trance (general)": "71", "Disco": "58", "Electronic - House": "10", "Experimental": "46", "Trance - Goa": "66", "Rock - Hard": "14", "Trance - Dream": "67", "Spiritual": "47", "Metal - Extreme": "37", "Jazz (general)": "29", "Trance - Tribal": "70", "Classical": "20", "Hip-Hop": "22", "Bluegrass": "105", "Halloween": "82", "Jazz - Acid": "30", "Easy Listening": "107", "New Age": "44", "Fantasy": "52", "Blues": "19", "Other": "41", "Trance - Acid": "63", "Gothic": "38", "Electronic - Hardcore": "39", "One Hour Compo": "53", "Pop - Soft": "62", "Electronic - Techno": "7", "Religious": "49", "Folk": "21"}
     categories = []
- 
-    
     
 
     # refresh category list
     def update_categories(self):
 
@@ -80,31 +68,14 @@
                 sub = []
                 self.categories.append(main)
             else:
                 sub.append(subname)
                 self.catmap[subname] = id
-        #
-        
-        #-- keep catmap as cache-file, it's essential for redisplaying        
-        self.save()
-        return
-
-
-    # saves .streams and .catmap
-    def save(self):
-        ChannelPlugin.save(self)
-        conf.save("cache/catmap_" + self.module, self.catmap)
-
-
-    # read previous channel/stream data, if there is any
-    def cache(self):
-        ChannelPlugin.cache(self)
-        # catmap
-        cache = conf.load("cache/catmap_" + self.module)
-        if (cache):
-            self.catmap = cache
+
+        # .categories and .catmap are saved by reload_categories()
         pass
+
 
 
     # download links from dmoz listing
     def update_streams(self, cat):
 

Index: channels/shoutcast.py
==================================================================
--- channels/shoutcast.py
+++ channels/shoutcast.py
@@ -84,12 +84,14 @@
                 self.categories.append(title)
                 current = []
                 self.categories.append(current)
             else:
                 current.append(title)
-        self.save()
 
+        # .categories/.catmap get saved by reload_categories()
+        pass
+        
 
     # downloads stream list from shoutcast for given category
     def update_streams(self, cat):
 
         if (cat not in self.catmap):
@@ -125,16 +127,5 @@
             })
 
         #__print__(dbg.DATA, entries)
         return entries
 
-
-    # saves .streams and .catmap
-    def save(self):
-        channels.ChannelPlugin.save(self)
-        conf.save("cache/catmap_" + self.module, self.catmap)
-
-    # read previous channel/stream data, if there is any
-    def cache(self):
-        channels.ChannelPlugin.cache(self)
-        self.catmap = conf.load("cache/catmap_" + self.module) or {}
-