Get rid of cacheHandler reference in Type

With Holder and Type decoupled, we do not need it anymore