Fix freeze since info is already cached