I like your detailed comments.
Does your current change have the same "cacheable" results as before? From what I understood from you change, you have not checked "userParamSet" like the "partitionParam" in AdHocPlannerWork. 

Maybe you have done something different and I do not get it in such a big change sets.