Fix import issues
Revert to using a CartStore, because injecting the cache directly prevents the Session bean from being created.