Removal of Cacheable.prototype.attr and further cleanup of .model