Improve performance.

Since 05f9dcaedd485986f897f28b3042a4f1114f97f7, there is a lack of performance about adapter/mock.
This PR resolve this problem.
Moreover, if an adapter is cloned, it will be added to the storage.
Finally, storage is not mandatory for adapter.