clean-up and respect $mapping[cascade]

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