Tweaked AttributeMapper._fill_cache to also store values on the Attribute instance...