Cache fix and improved reimbursement labelling