Updated to cache objects and return that cache for cross references