Make cache a class for now