clean-up and respect $mapping[cascade]

... due 'cascade' is not accessible anymore in ResolveTargetDocumentListener while remapping and resolved document does not inherit original cascade rules.