H1B Cap transfer to => Cap-exempt future


I was working for non-profit organization on cap-exempt H1B. Recently started working at the for-profit company on cap H1B after approval this season. If I have to move back to the previous employer (non-profit, cap-exempt) -

1] Would my cap counted H1B be converted to cap-exempt H1B for employer transfer?

2] If I have to move to a for-profit company in the future from non-profit, would I have to file a new cap H1B petition?

Thank you in advance for all your answers. This forum has been a real help.