Rename _cached_unit to cached_unit