Ticket 20870v2

Additional notes on @cached_property