Updated cachematrix