major change to cachematrix