Remove cache requirement, prepare for branch split