Fixes for Cart lifetime

https://trello.com/c/Qgt5hBPI/98-bug-bag-not-saved-for-logged-in-users
https://trello.com/c/J3fEt6jI/99-basket-is-not-persistent