Refactor use of manual cached attributes #2254

Job	Run time
Check flake8	12s
pytest (unclaimed)	2m 32s
Process test coverage (unclaimed)	12s
	2m 56s

Provide feedback