Check for SaveHandlerInterface in the container and use that if set

Check for SaveHandlerInterface in the container and use that if set #628