*** NO COMMENTS ***

*** 152,162 ****
          XXX Image file format?  Image file manipulation API?"""
  
          required_subdirs = [ "catalog", "file", "pkg" ]
          image_subdirs = required_subdirs + [ "index", "state/installed" ]
  
!         def __init__(self):
                  self.cfg_cache = None
                  self.type = None
                  self.root = None
                  self.history = history.History()
                  self.imgdir = None
--- 152,163 ----
          XXX Image file format?  Image file manipulation API?"""
  
          required_subdirs = [ "catalog", "file", "pkg" ]
          image_subdirs = required_subdirs + [ "index", "state/installed" ]
  
!         def __init__(self, use_cache=True):
!                 self.use_cache=use_cache
                  self.cfg_cache = None
                  self.type = None
                  self.root = None
                  self.history = history.History()
                  self.imgdir = None
*** 937,946 ****
--- 938,948 ----
  
                  if fmri in self.__manifest_cache:
                          m = self.__manifest_cache[fmri]
                  else:
                          m = self.__get_manifest(fmri)
+                         if self.use_cache:
                                  self.__manifest_cache[fmri] = m
  
                  self.__touch_manifest(fmri)
  
                  # XXX perhaps all of the below should live in Manifest.filter()?