Added some more leverage caching attributes.