Removed @cached_property from TODO