break context chain at component boundaries - fixes #470

This fixes @browniefed's issue in #470, I haven't looked into @MartinKolarik's yet. Fingers crossed this hits two birds with one stone...