diff --git a/.buildkite/swift-test.sh b/.buildkite/swift-test.sh
index 1b12f4af1..2155606e7 100755
--- a/.buildkite/swift-test.sh
+++ b/.buildkite/swift-test.sh
@@ -18,7 +18,7 @@ function build_for_real_device() {
     echo "--- :swift: Building for $platform device"
     export NSUnbufferedIO=YES
     xcodebuild -destination "generic/platform=$platform" \
-        -scheme WordPressAPI-Package \
+        -scheme WordPressAPI \
         -derivedDataPath DerivedData \
         -skipPackagePluginValidation \
         build | xcbeautify
diff --git a/Package.swift b/Package.swift
index 21e87dd66..50458d025 100644
--- a/Package.swift
+++ b/Package.swift
@@ -27,10 +27,6 @@ var package = Package(
             name: "WordPressAPI",
             targets: ["WordPressAPI"]
         ),
-        .library(
-            name: "WordPressApiCache",
-            targets: ["WordPressApiCache"]
-        )
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
@@ -60,13 +56,6 @@ var package = Package(
                 .swiftLanguageMode(.v5)
             ]
         ),
-        .target(
-            name: "WordPressApiCache",
-            dependencies: [
-                .target(name: "WordPressAPIInternal")
-            ],
-            path: "native/swift/Sources/wordpress-api-cache"
-        ),
         libwordpressFFI,
         .testTarget(
             name: "WordPressAPITests",
@@ -80,14 +69,6 @@ var package = Package(
                 .define("PROGRESS_REPORTING_ENABLED", .when(platforms: [.iOS, .macOS, .tvOS, .watchOS]))
             ]
         ),
-        .testTarget(
-            name: "WordPressApiCacheTests",
-            dependencies: [
-                .target(name: "WordPressApiCache"),
-                .target(name: "WordPressAPIInternal")
-            ],
-            path: "native/swift/Tests/wordpress-api-cache"
-        ),
         .testTarget(
             name: "WordPressApiCompatibilityTests",
             dependencies: [
diff --git a/native/swift/Sources/wordpress-api-cache/WordPressApiCache.swift b/native/swift/Sources/wordpress-api/WordPressApiCache.swift
similarity index 100%
rename from native/swift/Sources/wordpress-api-cache/WordPressApiCache.swift
rename to native/swift/Sources/wordpress-api/WordPressApiCache.swift
diff --git a/native/swift/Tests/wordpress-api-cache/WordPressApiCacheTests.swift b/native/swift/Tests/wordpress-api/WordPressApiCacheTests.swift
similarity index 97%
rename from native/swift/Tests/wordpress-api-cache/WordPressApiCacheTests.swift
rename to native/swift/Tests/wordpress-api/WordPressApiCacheTests.swift
index 706635d37..98ea7ab42 100644
--- a/native/swift/Tests/wordpress-api-cache/WordPressApiCacheTests.swift
+++ b/native/swift/Tests/wordpress-api/WordPressApiCacheTests.swift
@@ -1,6 +1,6 @@
 import Foundation
 import Testing
-import WordPressApiCache
+import WordPressAPI
 
 actor Test {
 
diff --git a/scripts/xcodebuild-test.sh b/scripts/xcodebuild-test.sh
index ffbd3b2da..21be390e6 100755
--- a/scripts/xcodebuild-test.sh
+++ b/scripts/xcodebuild-test.sh
@@ -29,7 +29,7 @@ echo "Runing on device: ${device_name}"
 export NSUnbufferedIO=YES
 
 xcodebuild \
-    -scheme WordPressAPI-Package \
+    -scheme WordPressAPI \
     -derivedDataPath DerivedData \
     -destination "id=${device_id}" \
     -skipPackagePluginValidation \