Fix refactoring oversight
Pass object to cache module where available, which avoids many unnecessary get_object_by_guid
calls in nap module