Removed first_connection checking, relying on caching