Tweaked the imports in Cache.hh