diff --git a/cmake/Set-Toolchain-vcpkg.cmake b/cmake/Set-Toolchain-vcpkg.cmake
index 858d8b6d..6b49334c 100644
--- a/cmake/Set-Toolchain-vcpkg.cmake
+++ b/cmake/Set-Toolchain-vcpkg.cmake
@@ -1,148 +1,176 @@
-macro(check_git_status)
-    if(NOT git_status EQUAL 0)
+macro(vcpkg_check_git_status)
+    if(NOT vcpkg_git_status EQUAL 0)
         message(FATAL_ERROR "Error updating vcpkg from git, please make sure git for windows is installed correctly, it can be installed from Visual Studio components")
     endif()
 endmacro()
 
-if(VCPKG_TARGET_TRIPLET)
-    if(NOT DEFINED ENV{VCPKG_ROOT})
-        if(WIN32)
-            if(DEFINED ENV{CI} OR EXISTS /vcpkg)
-                set(VCPKG_ROOT /vcpkg)
-            elseif(EXISTS c:/vcpkg)
-                set(VCPKG_ROOT c:/vcpkg)
-            endif()
-        endif()
+function(vcpkg_get_first_upgrade)
+    # First get the list of upgraded ports.
+    execute_process(
+        COMMAND ${vcpkg_exe} upgrade
+        OUTPUT_VARIABLE upgradable
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        ERROR_QUIET
+        WORKING_DIRECTORY ${VCPKG_ROOT}
+    )
 
-        if(NOT DEFINED VCPKG_ROOT)
-            get_filename_component(VCPKG_ROOT ${CMAKE_SOURCE_DIR}/../vcpkg ABSOLUTE)
-        endif()
+    string(REGEX REPLACE "\r?\n" ";" upgrade_lines "${upgradable}")
 
-        set(ENV{VCPKG_ROOT} ${VCPKG_ROOT})
-    else()
-        set(VCPKG_ROOT $ENV{VCPKG_ROOT})
+    foreach(line ${upgrade_lines})
+        if(${line} MATCHES "^  [* ] ")
+            string(REGEX REPLACE "^  [* ] " "" vcpkg_first_upgrade ${line})
+            set(vcpkg_first_upgrade ${vcpkg_first_upgrade} PARENT_SCOPE)
+            return()
+        endif()
+    endforeach()
+endfunction()
+
+if(NOT DEFINED VCPKG_TARGET_TRIPLET)
+    return()
+endif()
+
+if(NOT DEFINED ENV{VCPKG_ROOT})
+    if(WIN32)
+        if(DEFINED ENV{CI} OR EXISTS /vcpkg)
+            set(VCPKG_ROOT /vcpkg)
+        elseif(EXISTS c:/vcpkg)
+            set(VCPKG_ROOT c:/vcpkg)
+        endif()
     endif()
 
-    if(NOT EXISTS ${VCPKG_ROOT})
-        get_filename_component(vcpkg_root_parent ${VCPKG_ROOT}/.. ABSOLUTE)
+    if(NOT DEFINED VCPKG_ROOT)
+        get_filename_component(VCPKG_ROOT ${CMAKE_SOURCE_DIR}/../vcpkg ABSOLUTE)
+    endif()
+
+    set(ENV{VCPKG_ROOT} ${VCPKG_ROOT})
+else()
+    set(VCPKG_ROOT $ENV{VCPKG_ROOT})
+endif()
+
+if(NOT EXISTS ${VCPKG_ROOT})
+    get_filename_component(vcpkg_root_parent ${VCPKG_ROOT}/.. ABSOLUTE)
+
+    execute_process(
+        COMMAND git clone https://github.com/microsoft/vcpkg.git
+        RESULT_VARIABLE vcpkg_git_status
+        WORKING_DIRECTORY ${vcpkg_root_parent}
+    )
+
+    vcpkg_check_git_status()
+else()
+    # this is the case when we cache vcpkg/installed with the appveyor build cache
+    if(NOT EXISTS ${VCPKG_ROOT}/.git)
+        set(git_commands
+            "git init"
+            "git remote add origin https://github.com/microsoft/vcpkg.git"
+            "git fetch --all --prune"
+            "git reset --hard origin/master"
+            "git branch --set-upstream-to=origin/master master"
+        )
+        foreach(git_command ${git_commands})
+            separate_arguments(git_command)
+
+            execute_process(
+                COMMAND ${git_command}
+                RESULT_VARIABLE vcpkg_git_status
+                WORKING_DIRECTORY ${VCPKG_ROOT}
+            )
+
+            vcpkg_check_git_status()
+        endforeach()
+    else()
+        execute_process(
+            COMMAND git fetch origin
+            RESULT_VARIABLE vcpkg_git_status
+            WORKING_DIRECTORY ${VCPKG_ROOT}
+        )
+        vcpkg_check_git_status()
 
         execute_process(
-            COMMAND git clone https://github.com/microsoft/vcpkg.git
-            RESULT_VARIABLE git_status
-            WORKING_DIRECTORY ${vcpkg_root_parent}
+            COMMAND git status
+            RESULT_VARIABLE vcpkg_git_status
+            OUTPUT_VARIABLE git_status_text
+            WORKING_DIRECTORY ${VCPKG_ROOT}
         )
+        vcpkg_check_git_status()
 
-        check_git_status()
-    else()
-        # this is the case when we cache vcpkg/installed with the appveyor build cache
-        if(NOT EXISTS ${VCPKG_ROOT}/.git)
-            set(git_commands
-                "git init"
-                "git remote add origin https://github.com/microsoft/vcpkg.git"
-                "git fetch --all --prune"
-                "git reset --hard origin/master"
-                "git branch --set-upstream-to=origin/master master"
-            )
-            foreach(git_command ${git_commands})
-                separate_arguments(git_command)
+        set(vcpkg_git_up_to_date FALSE)
 
-                execute_process(
-                    COMMAND ${git_command}
-                    RESULT_VARIABLE git_status
-                    WORKING_DIRECTORY ${VCPKG_ROOT}
-                )
-
-                check_git_status()
-            endforeach()
-        else()
-            execute_process(
-                COMMAND git fetch origin
-                RESULT_VARIABLE git_status
-                WORKING_DIRECTORY ${VCPKG_ROOT}
-            )
-            check_git_status()
-
-            execute_process(
-                COMMAND git status
-                RESULT_VARIABLE git_status
-                OUTPUT_VARIABLE git_status_text
-                WORKING_DIRECTORY ${VCPKG_ROOT}
-            )
-            check_git_status()
-
-            set(git_up_to_date FALSE)
-
-            if(git_status_text MATCHES "Your branch is up to date with")
-                set(git_up_to_date TRUE)
-            endif()
-
-            if(NOT git_up_to_date)
-                execute_process(
-                    COMMAND git pull --rebase
-                    RESULT_VARIABLE git_status
-                    WORKING_DIRECTORY ${VCPKG_ROOT}
-                )
-
-                check_git_status()
-            endif()
+        if(git_status_text MATCHES "Your branch is up to date with")
+            set(vcpkg_git_up_to_date TRUE)
         endif()
 
-        check_git_status()
-    endif()
+        if(NOT vcpkg_git_up_to_date)
+            execute_process(
+                COMMAND git pull --rebase
+                RESULT_VARIABLE vcpkg_git_status
+                WORKING_DIRECTORY ${VCPKG_ROOT}
+            )
 
-    # build latest vcpkg, if needed
-    if(NOT git_up_to_date)
-        if(WIN32)
-            execute_process(
-                COMMAND bootstrap-vcpkg.bat
-                WORKING_DIRECTORY ${VCPKG_ROOT}
-            )
-        else()
-            execute_process(
-                COMMAND ./bootstrap-vcpkg.sh
-                WORKING_DIRECTORY ${VCPKG_ROOT}
-            )
+            vcpkg_check_git_status()
         endif()
     endif()
 
-    foreach(pkg ${VCPKG_DEPS})
-        list(APPEND VCPKG_DEPS_QUALIFIED ${pkg}:${VCPKG_TARGET_TRIPLET})
-    endforeach()
-
-    if(WIN32)
-        set(vcpkg_exe vcpkg)
-    else()
-        set(vcpkg_exe ./vcpkg)
-    endif()
-
-    # update portfiles
-    execute_process(
-        COMMAND ${vcpkg_exe} update
-        WORKING_DIRECTORY ${VCPKG_ROOT}
-    )
-
-    # build our deps
-    execute_process(
-        COMMAND ${vcpkg_exe} install ${VCPKG_DEPS_QUALIFIED}
-        WORKING_DIRECTORY ${VCPKG_ROOT}
-    )
-
-    # make sure we have the latest versions
-    execute_process(
-        COMMAND ${vcpkg_exe} upgrade --no-dry-run
-        WORKING_DIRECTORY ${VCPKG_ROOT}
-    )
-
-    if(WIN32 AND VCPKG_TARGET_TRIPLET MATCHES x64 AND CMAKE_GENERATOR MATCHES "Visual Studio")
-        set(CMAKE_GENERATOR_PLATFORM x64 CACHE STRING "visual studio build architecture" FORCE)
-    endif()
-
-    if(WIN32 AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio"))
-        # set toolchain to VS for e.g. Ninja or jom
-        set(CMAKE_C_COMPILER   cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
-        set(CMAKE_CXX_COMPILER cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
-    endif()
-
-    set(CMAKE_TOOLCHAIN_FILE ${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake CACHE FILEPATH "vcpkg toolchain" FORCE)
-    include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)
+    vcpkg_check_git_status()
 endif()
+
+# build latest vcpkg, if needed
+if(NOT vcpkg_git_up_to_date)
+    if(WIN32)
+        execute_process(
+            COMMAND bootstrap-vcpkg.bat
+            WORKING_DIRECTORY ${VCPKG_ROOT}
+        )
+    else()
+        execute_process(
+            COMMAND ./bootstrap-vcpkg.sh
+            WORKING_DIRECTORY ${VCPKG_ROOT}
+        )
+    endif()
+endif()
+
+foreach(pkg ${VCPKG_DEPS})
+    list(APPEND VCPKG_DEPS_QUALIFIED ${pkg}:${VCPKG_TARGET_TRIPLET})
+endforeach()
+
+if(WIN32)
+    set(vcpkg_exe vcpkg)
+else()
+    set(vcpkg_exe ./vcpkg)
+endif()
+
+# update portfiles
+execute_process(
+    COMMAND ${vcpkg_exe} update
+    WORKING_DIRECTORY ${VCPKG_ROOT}
+)
+
+# build our deps
+execute_process(
+    COMMAND ${vcpkg_exe} install ${VCPKG_DEPS_QUALIFIED}
+    WORKING_DIRECTORY ${VCPKG_ROOT}
+)
+
+# If ports have been updated, rebuild cache one at a time to not overrun the CI time limit.
+vcpkg_get_first_upgrade()
+
+if(DEFINED vcpkg_first_upgrade)
+    execute_process(
+        COMMAND ${vcpkg_exe} upgrade --no-dry-run ${vcpkg_first_upgrade}
+        WORKING_DIRECTORY ${VCPKG_ROOT}
+    )
+endif()
+
+if(WIN32 AND VCPKG_TARGET_TRIPLET MATCHES x64 AND CMAKE_GENERATOR MATCHES "Visual Studio")
+    set(CMAKE_GENERATOR_PLATFORM x64 CACHE STRING "visual studio build architecture" FORCE)
+endif()
+
+if(WIN32 AND (NOT CMAKE_GENERATOR MATCHES "Visual Studio"))
+    # set toolchain to VS for e.g. Ninja or jom
+    set(CMAKE_C_COMPILER   cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
+    set(CMAKE_CXX_COMPILER cl CACHE STRING "Microsoft C/C++ Compiler" FORCE)
+endif()
+
+set(CMAKE_TOOLCHAIN_FILE ${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake CACHE FILEPATH "vcpkg toolchain" FORCE)
+
+include(${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake)