Bugfix: cached attributes were not getting linked