Make scheme
a cached property as well
#1058
Merged
scheme
a cached property as well
#1058