Well, we do see Cap both in his Ultimate costume (which I hate) and in his classic costume with the real shield, so that's definitely going to get addressed. I also caught a glimpse of what looked like Cap breaking loose from somewhere.
The B plot was totally worth the entire episode. The Principal's coke dealings was awesome. I know people love Roger, but I am getting really bored with him. Andy Dick jokes are not funny, but they used him as a nice foil for Roger.