Rule Question: Agonizing Blast and Booming/Green Flame Blade

First of, sorry if that is a stupid question.

I am building up a new Char, and I was reading how the new Agonizing Blast works, and I have a question in regards to the tw blade cantrips:

From Level 5 on, I roll damage 2 time for both of those, does that mean I add my Charisma mod to both of these Instances?
And Green Flame Blade already gets my Charisma Mod on the jumping flame part, does that mean if I pick that cantrip for Agonizing Blast, it deals my Charisma Bonus twiceon the jumping flame?