22.0-cleanup2-TrkExTools

Pull in-class classes (cache, and next volume parameters) from the extrapolator, prior to further refactoring (to follow).