--- EventCalendar-099.py	2008-11-05 16:39:43.000000000 +0000
+++ EventCalendar.py	2008-11-05 16:40:27.000000000 +0000
@@ -156,7 +156,7 @@
 
 from MoinMoin import wikiutil, config, search, caching
 from MoinMoin.Page import Page
-from MoinMoin.parser import wiki
+#from MoinMoin.parser import wiki
 import re, calendar, time, datetime
 import codecs, os, urllib, sha
 
@@ -1077,9 +1077,9 @@
         filteredeventkey = 'events_%s-%s' % (datefrom, dateto)
         caleventkey = 'calevents_%s-%s' % (datefrom, dateto)
         
-        cache_events = caching.CacheEntry(request, arena, eventkey)
-        cache_filteredevents = caching.CacheEntry(request, arena, filteredeventkey)
-        cache_calevents = caching.CacheEntry(request, arena, caleventkey)
+        cache_events = caching.CacheEntry(request, arena, eventkey,scope='item')
+        cache_filteredevents = caching.CacheEntry(request, arena, filteredeventkey,scope='item')
+        cache_calevents = caching.CacheEntry(request, arena, caleventkey,scope='item')
         
         dirty = 1
         
@@ -1396,10 +1396,10 @@
     pagelistkey = 'eventpages'
     errmsglistkey = 'eventcalerrormsglist'
     
-    cache_events = caching.CacheEntry(request, arena, eventkey)
-    cache_labels = caching.CacheEntry(request, arena, labelkey)
-    cache_pages = caching.CacheEntry(request, arena, pagelistkey)
-    cache_errmsglist = caching.CacheEntry(request, arena, errmsglistkey)
+    cache_events = caching.CacheEntry(request, arena, eventkey,scope='item')
+    cache_labels = caching.CacheEntry(request, arena, labelkey,scope='item')
+    cache_pages = caching.CacheEntry(request, arena, pagelistkey,scope='item')
+    cache_errmsglist = caching.CacheEntry(request, arena, errmsglistkey,scope='item')
     
     # page list cache
 
@@ -1422,10 +1422,10 @@
         categorypages = searchPages(request, category)
         for page in categorypages:
             eventpages.append(page.page_name)
-        cache_pages.update('\n'.join(eventpages), True)
+        cache_pages.update('\n'.join(eventpages).encode('utf-8'))
         debug('New page list is built: %d pages' % len(eventpages))
     else:
-        eventpages = cache_pages.content(True).split('\n')
+        eventpages = cache_pages.content().decode('utf-8').split('\n')
         debug('Cached page list is used: %d pages' % len(eventpages))
     
     if not Globs.page_action == 'refresh':
@@ -1457,9 +1457,9 @@
             p = Page(request, page_name)
             e_ref = page_name
             
-            cache_errmsg = caching.CacheEntry(request, p, errmsgkey)
-            cache_eventrecords = caching.CacheEntry(request, p, eventrecordkey)
-            cache_labelrecords = caching.CacheEntry(request, p, labelrecordkey)
+            cache_errmsg = caching.CacheEntry(request, p, errmsgkey,scope='item')
+            cache_eventrecords = caching.CacheEntry(request, p, eventrecordkey,scope='item')
+            cache_labelrecords = caching.CacheEntry(request, p, labelrecordkey,scope='item')
             
             if cache_eventrecords.needsUpdate(p._text_filename()) or cache_labelrecords.needsUpdate(p._text_filename()) or Globs.page_action == 'refresh':
                 page_content = p.get_raw_body()