diff --git a/wiki/macro/EventCalendar.py b/wiki/macro/EventCalendar.py
index eda4cb3d..b8ac13e6 100644
--- a/wiki/macro/EventCalendar.py
+++ b/wiki/macro/EventCalendar.py
@@ -250,7 +250,7 @@ def execute(macro, args):
     if args:
         args=request.getText(args)
 
-    for item in macro.form.items():
+    for item in macro.request.form.items():
         if not form_vals.has_key(item[0]):
             try:
                 form_vals[item[0]]=item[1][0]
@@ -1077,9 +1077,9 @@ def loadEvents(datefrom='', dateto='', nocache=0):
         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 @@ def loadEventsFromWikiPages():
     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
 
@@ -1458,9 +1458,9 @@ def loadEventsFromWikiPages():
             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()