last changes to cachematrix