diff --git a/buildd b/buildd
index 47c8f93..9d15c84 100755
--- a/buildd
+++ b/buildd
@@ -27,7 +27,7 @@ import sys
 from optparse import OptionGroup
 from optparse import OptionParser
 from ubuntutools.lp.udtexceptions import SeriesNotFoundException, PackageNotFoundException
-from ubuntutools.lp.lpapiwrapper import LpApiWrapper, PersonTeam
+from ubuntutools.lp.lpapicache import LpApiWrapper, PersonTeam
 
 # Usage.
 usage = "%prog <srcpackage> <release> <operation>\n\n"
diff --git a/pull-lp-source b/pull-lp-source
index c8a60fa..6f3cb6a 100755
--- a/pull-lp-source
+++ b/pull-lp-source
@@ -33,7 +33,7 @@ import urllib2
 from optparse import OptionParser
 
 # ubuntu-dev-tools modules.
-from ubuntutools.lp.lpapiwrapper import LpApiWrapper
+from ubuntutools.lp.lpapicache import LpApiWrapper
 from ubuntutools.lp.udtexceptions import SeriesNotFoundException, PackageNotFoundException
 
 if not os.path.exists("/usr/bin/dget"):
diff --git a/requestsync b/requestsync
index a6b701c..2df9471 100755
--- a/requestsync
+++ b/requestsync
@@ -38,7 +38,7 @@ from time import sleep
 # ubuntu-dev-tools modules.
 import ubuntutools.lp.libsupport as lp_libsupport
 import ubuntutools.lp.udtexceptions as udtexceptions
-from ubuntutools.lp.lpapiwrapper import Launchpad, LpApiWrapper, PersonTeam
+from ubuntutools.lp.lpapicache import Launchpad, LpApiWrapper, PersonTeam
 # https_proxy fix
 import ubuntutools.common
 import ubuntutools.packages
diff --git a/ubuntutools/lp/lpapiwrapper.py b/ubuntutools/lp/lpapicache.py
similarity index 98%
rename from ubuntutools/lp/lpapiwrapper.py
rename to ubuntutools/lp/lpapicache.py
index ecb6559..16327cb 100644
--- a/ubuntutools/lp/lpapiwrapper.py
+++ b/ubuntutools/lp/lpapicache.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
-#   lpapiwrapper.py - wrapper class around the LP API for use in the
-#   ubuntu-dev-tools package
+#   lpapicache.py - wrapper classes around the LP API implementing caching
+#                   for usage in the ubuntu-dev-tools package
 #
 #   Copyright © 2009 Michael Bienia <geser@ubuntu.com>
 #
@@ -50,6 +50,8 @@ class Launchpad(object):
 		return self
 Launchpad = Launchpad()
 
+# Almost deprecated, better use the specific classes like Distribution
+# or PersonTeam directly
 class LpApiWrapper(object):
 	'''
 	Wrapper around some common used LP API functions used in