Switching to simpler cached_property function