Change address factory to reuse state before creating one