[#82417004] refactor Cart