What's the Name of That Book??? discussion

I read this series a few years ago, she didn't want to be a princess so she runs away and ends up working for a dragon. The dragon lives in a cave and I think he (she?) had a bunch of random things inside. The girl uses the dragon and lies to get rid of the suitors/princes that come knocking.

(Spoilers ahead) She ends up with a prince and they have a child, a boy I think. But a witch (I think I know there is one in the story at least) sets a spell on him (the original prince) and he is frozen/locked away and his wife goes to hide the sword to unlock the spell until their son can use it, In the last book I read.

Ooo! I know that one - Dealing with Dragons (and its sequels) by Patricia Wrede. I love that book and have read it several times.

I think that is it, thank you so much!