More line item grouping. Removing order cache as it was growing way too large way too quickly.