diff --git a/.github/workflows/codeplugs.yml b/.github/workflows/codeplugs.yml
index adb70cb..7645901 100644
--- a/.github/workflows/codeplugs.yml
+++ b/.github/workflows/codeplugs.yml
@@ -19,14 +19,22 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
+    - name: Get current time
+      uses: 1466587594/get-current-time@v2
+      id: current-time
+      with:
+        format: YYYYMMDD-A
+        utcOffset: "-08:00"
+    - name: Cache .cache
+      uses: actions/cache@v2
+      with:
+        path: ~/.cache
+        key: dzcb-cache-${{ steps.current-time.outputs.formattedTime }}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
         pip install tox
     - name: Build Codeplugs
-      env:
-        REPEATERBOOK_USER: ${{ secrets.REPEATERBOOK_USER }}
-        REPEATERBOOK_PASSWD: ${{ secrets.REPEATERBOOK_PASSWD }}
       run: tox
     - name: Archive Codeplugs
       uses: actions/upload-artifact@v2
diff --git a/input/default/generate.sh b/input/default/generate.sh
index a0494f1..886ac30 100755
--- a/input/default/generate.sh
+++ b/input/default/generate.sh
@@ -6,6 +6,7 @@ python -m dzcb \
     --pnwdigital \
     --seattledmr \
     --default-k7abd \
+    --repeaterbook-state washington oregon \
     --repeaterbook-proximity-csv "$DIR/prox.csv" \
     --k7abd $DIR/k7abd \
     --farnsworth-template-json "$DIR/example-md-uv380.json" \
diff --git a/input/default/prox.csv b/input/default/prox.csv
index 1f008a8..63b7d84 100644
--- a/input/default/prox.csv
+++ b/input/default/prox.csv
@@ -1,18 +1,19 @@
-Longview WA VHF 35mi,46.13819885,-122.93800354,35,m,14,
-Longview WA UHF 35mi,46.13819885,-122.93800354,35,m,4,
-Astoria OR VHF 30mi,46.18790054,-123.83100128,30,m,14,
-Astoria OR UHF 30mi,46.18790054,-123.83100128,30,m,4,
-Portland OR VHF 30mi,45.52310181,-122.67600250,30,m,14,
-Portland OR UHF 30mi,45.52310181,-122.67600250,30,m,4,
-Salem OR VHF 39mi,44.94290161,-123.03500366,39,m,14,
-Salem OR UHF 39mi,44.94290161,-123.03500366,39,m,4,
-Hood River OR VHF 35mi,45.70539856,-121.52100372,35,m,14,
-Hood River OR UHF 35mi,45.70539856,-121.52100372,35,m,4,
-Olympia WA VHF 30mi,47.03789902,-122.90100098,30,m,14,
-Olympia WA UHF 30mi,47.03789902,-122.90100098,30,m,4,
-Packwood WA VHF 40mi,46.60649872,-121.67099762,40,m,14,
-Packwood WA UHF 40mi,46.60649872,-121.67099762,40,m,4,
-Seattle WA VHF 45mi,47.60620117,-122.33200073,45,m,14,
-Seattle WA UHF 45mi,47.60620117,-122.33200073,45,m,4,
-Burlington WA VHF 45mi,48.47570038,-122.32499695,45,m,14,
-Burlington WA UHF 45mi,48.47570038,-122.32499695,45,m,4,
+Zone Name,Lat,Long,Distance,Unit,Band(2m;1.25m;70cm),Use,Operational Status
+Longview WA VHF 35mi,46.13819885,-122.93800354,35,miles,2m,OPEN,On-Air
+Longview WA UHF 35mi,46.13819885,-122.93800354,35,miles,70cm,OPEN,On-Air
+Astoria OR VHF 30mi,46.18790054,-123.83100128,30,miles,2m,OPEN,On-Air
+Astoria OR UHF 30mi,46.18790054,-123.83100128,30,miles,70cm,OPEN,On-Air
+Portland OR VHF 30mi,45.52310181,-122.67600250,30,miles,2m,OPEN,On-Air
+Portland OR UHF 30mi,45.52310181,-122.67600250,30,miles,70cm,OPEN,On-Air
+Salem OR VHF 39mi,44.94290161,-123.03500366,39,miles,2m,OPEN,On-Air
+Salem OR UHF 39mi,44.94290161,-123.03500366,39,miles,70cm,OPEN,On-Air
+Hood River OR VHF 35mi,45.70539856,-121.52100372,35,miles,2m,OPEN,On-Air
+Hood River OR UHF 35mi,45.70539856,-121.52100372,35,miles,70cm,OPEN,On-Air
+Olympia WA VHF 30mi,47.03789902,-122.90100098,30,miles,2m,OPEN,On-Air
+Olympia WA UHF 30mi,47.03789902,-122.90100098,30,miles,70cm,OPEN,On-Air
+Packwood WA VHF 40mi,46.60649872,-121.67099762,40,miles,2m,OPEN,On-Air
+Packwood WA UHF 40mi,46.60649872,-121.67099762,40,miles,70cm,OPEN,On-Air
+Seattle WA VHF 45mi,47.60620117,-122.33200073,45,miles,2m,OPEN,On-Air
+Seattle WA UHF 45mi,47.60620117,-122.33200073,45,miles,70cm,OPEN,On-Air
+Burlington WA VHF 45mi,48.47570038,-122.32499695,45,miles,2m,OPEN,On-Air
+Burlington WA UHF 45mi,48.47570038,-122.32499695,45,miles,70cm,OPEN,On-Air
diff --git a/tox.ini b/tox.ini
index 2b45a03..0c71c50 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,12 +8,12 @@ envlist = py3-{linux,mac}
 platform =
     linux: linux
     mac: darwin
-passenv = OUTPUT REPEATERBOOK_USER REPEATERBOOK_PASSWD
+passenv = OUTPUT
 setenv =
     !mac: FIND_OPTS = -executable
     mac: FIND_OPTS = -perm '+111'
 deps =
-    dzcb~=0.1
+    dzcb~=0.2.0
 commands =
     /usr/bin/env bash -c " \
 	find {toxinidir}/input \