fixed handling of the cascade mapping option with annotations

fixes issues discussed in #205 which were introduced by #200