Refactor use of manual cached attributes #2267

Job	Run time
Check flake8	14s
pytest (unclaimed)	2m 37s
Process test coverage (unclaimed)	16s
	3m 7s

Provide feedback