you should be able to move this above mpaPartitions, I think. The cms doesn't have any internal mutable state.