Integrated cache
Fixed tests