Fix the self.name/cache problem