diff --git a/setup.py b/setup.py
index da82bcc..89aa4ef 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '0.1.1'
+version = '0.1.2'
 
 setup(name='z3c.jbot',
       version=version,
diff --git a/z3c/jbot/manager.py b/z3c/jbot/manager.py
index 55d28cd..9c760c7 100644
--- a/z3c/jbot/manager.py
+++ b/z3c/jbot/manager.py
@@ -1,6 +1,8 @@
 import sys
 import os.path
 
+import zope.thread
+
 def root_length(a, b):
     if b.startswith(a):
         return len(a)
@@ -21,7 +23,7 @@ def find_package(path):
 
     return path
     
-class GlobalTemplateManager(object):
+class GlobalTemplateManager(zope.thread.local):
     def __init__(self):
         self.templates = {}
         self.paths = {}