diff --git a/.github/workflows/samples-dart.yaml b/.github/workflows/samples-dart.yaml
index 7eec3ffef55..fdbdb94f921 100644
--- a/.github/workflows/samples-dart.yaml
+++ b/.github/workflows/samples-dart.yaml
@@ -22,22 +22,14 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: 11
-      - name: Cache maven dependencies
-        uses: actions/cache@v3
-        env:
-          cache-name: maven-repository
-        with:
-          path: |
-            ~/.m2/repository
-            ~/.gradle
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
+          cache: maven
       - name: Cache test dependencies
         uses: actions/cache@v3
         env:
           cache-name: pub-cache
         with:
           path: $PUB_CACHE
-          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.yaml') }}
+          key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('samples/**/pubspec.*') }}
       - uses: dart-lang/setup-dart@v1
         with:
           sdk: 2.15.0
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof/pom.xml b/samples/openapi3/client/petstore/dart-dio/oneof/pom.xml
index 22a9189f7d0..04578c5a225 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof/pom.xml
+++ b/samples/openapi3/client/petstore/dart-dio/oneof/pom.xml
@@ -24,7 +24,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>pub-get</id>
@@ -33,8 +32,9 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
+                                <argument>pub</argument>
                                 <argument>get</argument>
                             </arguments>
                         </configuration>
@@ -46,7 +46,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
                                 <argument>run</argument>
                                 <argument>build_runner</argument>
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/pom.xml b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/pom.xml
index 50f62b7f8da..a2d9191ae40 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/pom.xml
+++ b/samples/openapi3/client/petstore/dart-dio/oneof_polymorphism_and_inheritance/pom.xml
@@ -24,7 +24,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>pub-get</id>
@@ -33,8 +32,9 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
+                                <argument>pub</argument>
                                 <argument>get</argument>
                             </arguments>
                         </configuration>
@@ -46,7 +46,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
                                 <argument>run</argument>
                                 <argument>build_runner</argument>
diff --git a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/pom.xml b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/pom.xml
index cceaebd895f..9ac7164a7b4 100644
--- a/samples/openapi3/client/petstore/dart-dio/oneof_primitive/pom.xml
+++ b/samples/openapi3/client/petstore/dart-dio/oneof_primitive/pom.xml
@@ -24,7 +24,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>pub-get</id>
@@ -33,8 +32,9 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
+                                <argument>pub</argument>
                                 <argument>get</argument>
                             </arguments>
                         </configuration>
@@ -46,7 +46,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
                                 <argument>run</argument>
                                 <argument>build_runner</argument>
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/pom.xml b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/pom.xml
index f7d20e4d37a..0bd86798d46 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/pom.xml
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/pom.xml
@@ -24,7 +24,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>pub-get</id>
@@ -33,8 +32,9 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
+                                <argument>pub</argument>
                                 <argument>get</argument>
                             </arguments>
                         </configuration>
@@ -46,7 +46,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
                                 <argument>run</argument>
                                 <argument>build_runner</argument>
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pom.xml b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pom.xml
index 3ae0ded6004..0e26a68eb66 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pom.xml
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/pom.xml
@@ -24,7 +24,6 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
-                <version>1.2.1</version>
                 <executions>
                     <execution>
                         <id>pub-get</id>
@@ -33,8 +32,9 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
+                                <argument>pub</argument>
                                 <argument>get</argument>
                             </arguments>
                         </configuration>
@@ -46,7 +46,7 @@
                             <goal>exec</goal>
                         </goals>
                         <configuration>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
                                 <argument>run</argument>
                                 <argument>build_runner</argument>
@@ -89,8 +89,9 @@
                         </goals>
                         <configuration>
                             <workingDirectory>../petstore_client_lib_fake_tests</workingDirectory>
-                            <executable>pub</executable>
+                            <executable>dart</executable>
                             <arguments>
+                                <argument>pub</argument>
                                 <argument>get</argument>
                             </arguments>
                         </configuration>