--- orig/MoinMoin/action/AttachFile.py
+++ mod/MoinMoin/action/AttachFile.py
@@ -485,7 +485,9 @@
     finally:
         file.close()
 
-
+    # touch attachment directory to invalidate cache if new map is saved
+    if ext == '.map':
+        os.utime(getAttachDir(pagename), None)
 
 def del_file(pagename, request):
     _ = request.getText


--- orig/MoinMoin/parser/wiki.py
+++ mod/MoinMoin/parser/wiki.py
@@ -249,7 +249,7 @@
                     except OSError:
                         pass
                     else:
-                        mapid = 'ImageMapOf'+pagename
+                        mapid = 'ImageMapOf'+drawing
                         # replace MAPNAME
                         map = map.replace('%MAPNAME%', mapid)
                         # add alt and title tags to areas