[WIP] Cart performance optimizations