Reduced unnecessary complexity of the class attribute caching