fix imports
remove Cache reference form constructors, let types get the cache from
the configurator themselves.