Fix Cache tests