Added new cache tests
Fixed new cache tests