trimming classmate stuff
trimming
trimming...
trimming yet more
trimming TypeResolver
more trimming
Still trimming, trying to eliminate separate cache classes
still trimming