Introduce a abstract class for shared functionality. And remove static lazy getters.
Which where introduced by merging 20eabca1b3 after b14aca744f
20eabca1b3
b14aca744f