Add caching of related objects