Part of this change makes the "default" impl the thread-safe version, so to ensure consistency all consumers of this component need to use that impl.