diff --git a/src/vcpkg/binarycaching.cpp b/src/vcpkg/binarycaching.cpp
index 1748e51ba5..65c595c16e 100644
--- a/src/vcpkg/binarycaching.cpp
+++ b/src/vcpkg/binarycaching.cpp
@@ -798,7 +798,7 @@ namespace
                 Util::erase_remove_if(attempts, [&](const NuGetPrefetchAttempt& nuget_ref) -> bool {
                     // note that we would like the nupkg downloaded to buildtrees, but nuget.exe downloads it to the
                     // output directory
-                    auto nupkg_path = paths.package_dir(nuget_ref.spec) / nuget_ref.reference.id + ".nupkg";
+                    const auto nupkg_path = paths.packages / nuget_ref.reference.id / nuget_ref.reference.id + ".nupkg";
                     if (fs.exists(nupkg_path, IgnoreErrors{}))
                     {
                         fs.remove(nupkg_path, VCPKG_LINE_INFO);
@@ -806,6 +806,13 @@ namespace
                                            !fs.exists(nupkg_path, IgnoreErrors{}),
                                            "Unable to remove nupkg after restoring: %s",
                                            nupkg_path);
+                        const auto nuget_dir = nuget_ref.spec.dir();
+                        if (nuget_dir != nuget_ref.reference.id)
+                        {
+                            const auto path_from = paths.packages / nuget_ref.reference.id;
+                            const auto path_to = paths.packages / nuget_dir;
+                            fs.rename(path_from, path_to, VCPKG_LINE_INFO);
+                        }
                         cache_status[nuget_ref.result_index]->mark_restored();
                         return true;
                     }