diff --git a/packages/core-api/src/apis/ApiProvider.tsx b/packages/core-api/src/apis/ApiProvider.tsx
index e157782024..24610a1372 100644
--- a/packages/core-api/src/apis/ApiProvider.tsx
+++ b/packages/core-api/src/apis/ApiProvider.tsx
@@ -39,13 +39,19 @@ ApiProvider.propTypes = {
   children: PropTypes.node,
 };
 
-export function useApi<T>(apiRef: ApiRef<T>): T {
+export function useApiHolder(): ApiHolder {
   const apiHolder = useContext(Context);
 
   if (!apiHolder) {
     throw new Error('No ApiProvider available in react context');
   }
 
+  return apiHolder;
+}
+
+export function useApi<T>(apiRef: ApiRef<T>): T {
+  const apiHolder = useApiHolder();
+
   const api = apiHolder.get(apiRef);
   if (!api) {
     throw new Error(`No implementation available for ${apiRef}`);
diff --git a/packages/core-api/src/apis/index.ts b/packages/core-api/src/apis/index.ts
index 332636580c..c3689b6703 100644
--- a/packages/core-api/src/apis/index.ts
+++ b/packages/core-api/src/apis/index.ts
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export { ApiProvider, useApi } from './ApiProvider';
+export { ApiProvider, useApi, useApiHolder } from './ApiProvider';
 export { ApiRegistry } from './ApiRegistry';
 export { ApiTestRegistry } from './ApiTestRegistry';
 export * from './ApiRef';