diff --git a/.github/actions/get-avd-info/action.yml b/.github/actions/get-avd-info/action.yml
new file mode 100644
index 0000000..97a7863
--- /dev/null
+++ b/.github/actions/get-avd-info/action.yml
@@ -0,0 +1,19 @@
+name: "Get AVD Info"
+description: "Get the AVD info based on its API level."
+inputs:
+  api-level:
+    required: true
+outputs:
+  arch:
+    value: ${{ steps.get-avd-arch.outputs.arch }}
+  target:
+    value: ${{ steps.get-avd-target.outputs.target }}
+runs:
+  using: "composite"
+  steps:
+    - id: get-avd-arch
+      run: echo "arch=$(if [ ${{ inputs.api-level }} -ge 30 ]; then echo x86_64; else echo x86; fi)" >> $GITHUB_OUTPUT
+      shell: bash
+    - id: get-avd-target
+      run: echo "target=$(echo default)" >> $GITHUB_OUTPUT
+      shell: bash
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 8c08318..d7a1dbe 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -6,8 +6,11 @@ on:
   pull_request:
     types: [opened, synchronize]
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
+  # Limit concurrency to 1 for PRs. 'main' concurrency isn't limited.
+  group: ${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
+env:
+  JAVA_VERSION: 11
 jobs:
   unit-tests:
     runs-on: ubuntu-latest
@@ -15,24 +18,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # Refactor to make these dynamic with a low/high bracket only on schedule, not push
-        # For now this is just the fastest combo (api/arch/target/snapshot-warm-time) based on testing
-        api-level: [29]
-        arch: [x86_64]
-        target: [google_apis]
-        first-boot-delay: [600]
-        # This is useful for benchmarking, do 0, 1, 2, etc (up to 256 max job-per-matrix limit) for averages
-        iteration: [0]
-    env:
-      JAVA_TOOL_OPTIONS: -Xmx4g -XX:+UseParallelGC
+        api-level: [22, 26, 31]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
       - name: Setup Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           distribution: "adopt"
-          java-version: "11"
+          java-version: ${{ env.JAVA_VERSION }}
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
         timeout-minutes: 5
@@ -41,87 +35,24 @@ jobs:
           # Builds on other branches will only read from main branch cache writes
           # Comment this and the with: above out for performance testing on a branch
           cache-read-only: ${{ github.ref != 'refs/heads/main' }}
-
-      - name: Warm Gradle Cache
-        # This makes sure we fetch gradle network resources with a retry
-        uses: nick-invision/retry@v2
+      # API 30+ emulators only have x86_64 system images.
+      - name: Get AVD info
+        uses: ./.github/actions/get-avd-info
+        id: avd-info
         with:
-          timeout_minutes: 15
-          retry_wait_seconds: 60
-          max_attempts: 3
-          command: ./gradlew :kotlin-audio:packageDebugAndroidTest --daemon
+          api-level: ${{ matrix.api-level }}
       - name: Enable KVM
         run: |
           echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
           sudo udevadm control --reload-rules
           sudo udevadm trigger --name-match=kvm
-      # This appears to be 'Cache Size: ~1230 MB (1290026823 B)' based on watching action logs
-      # Repo limit is 10GB; branch caches are independent; branches may read default branch cache.
-      # We don't want branches to evict main branch snapshot, so save on main, read-only all else
-      - name: AVD cache
-        uses: actions/cache@v3
-        id: avd-cache
-        with:
-          path: |
-            ~/.android/avd/*
-            ~/.android/adb*
-          key: avd-${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-v1-${{ hashFiles('~/.android/avd/**/snapshots/**') }}
-          restore-keys: |
-            avd-${{ matrix.api-level }}-${{ matrix.arch }}-${{matrix.target}}-v1
-      - name: AVD Boot and Snapshot Creation
-        # Only generate a snapshot for saving if we are on main branch with a cache miss
-        # Comment the if out to generate snapshots on branch for performance testing
-        if: steps.avd-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/main'
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          force-avd-creation: false
-          target: ${{ matrix.target }}
-          arch: ${{ matrix.arch }}
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          sdcard-path-or-size: 100M
-          disable-animations: true
-          # Give the emulator a little time to run and do first boot stuff before taking snapshot
-          script: echo "Generated AVD snapshot for caching."
-
-        # This step is separate so pure install time may be calculated as a step
-      - name: Emulator Snapshot After Firstboot Warmup
-        # Only generate a snapshot for saving if we are on main branch with a cache miss
-        # Switch the if statements via comment if generating snapshots for performance testing
-        # if: matrix.first-boot-delay != '0'
-        if: steps.avd-cache.outputs.cache-hit != 'true' && github.ref == 'refs/heads/main'
-        env:
-          FIRST_BOOT_DELAY: ${{ matrix.first-boot-delay }}
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          force-avd-creation: false
-          target: ${{ matrix.target }}
-          arch: ${{ matrix.arch }}
-          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          sdcard-path-or-size: 100M
-          disable-animations: true
-          # Give the emulator a little time to run and do first boot stuff before taking snapshot
-          script: |
-            sleep $FIRST_BOOT_DELAY
-            echo "First boot warmup completed."
       - name: Run Emulator Tests
         uses: reactivecircus/android-emulator-runner@v2
-        timeout-minutes: 30
         with:
           api-level: ${{ matrix.api-level }}
-          force-avd-creation: false
-          target: ${{ matrix.target }}
-          arch: ${{ matrix.arch }}
-          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
-          sdcard-path-or-size: 100M
-          disable-animations: true
-          script: |
-            $ANDROID_HOME/platform-tools/adb logcat '*:D' > adb-log.txt &
-            sleep 5
-            $ANDROID_HOME/platform-tools/adb shell su root "setprop ctl.restart zygote"
-            sleep 10
-            ./gradlew :kotlin-audio:connectedCheck --daemon
+          arch: ${{ steps.avd-info.outputs.arch }}
+          target: ${{ steps.avd-info.outputs.target }}
+          script: ./gradlew :kotlin-audio:connectedCheck
       - name: Publish Test Report
         uses: mikepenz/action-junit-report@v3
         if: always() # always run even if the previous step fails
@@ -132,10 +63,17 @@ jobs:
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v2
-      - name: Setup Java
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
           distribution: "adopt"
-          java-version: "11"
+          java-version: ${{ env.JAVA_VERSION }}
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        timeout-minutes: 5
+        with:
+          # Only write to the cache for builds on the 'main' branches, stops branches evicting main cache
+          # Builds on other branches will only read from main branch cache writes
+          # Comment this and the with: above out for performance testing on a branch
+          cache-read-only: ${{ github.ref != 'refs/heads/main' }}
       - name: Build Example App
         run: ./gradlew :kotlin-audio-example:assembleDebug