diff --git a/.github/workflows/test-push.yml b/.github/workflows/test-push.yml
index 3ad0ae9f..7dbb8419 100644
--- a/.github/workflows/test-push.yml
+++ b/.github/workflows/test-push.yml
@@ -45,7 +45,8 @@ jobs:
           key: ${{ matrix.build }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ matrix.build }}-cargo-registry-
-        if: env.IS_MD_FILE == 'false'
+          # HACK(@ohsayan): The next line skips caching until it is fixed
+        if: runner.os != 'macOS' && env.IS_MD_FILE == 'false'
 
       - name: Cache Cargo index
         uses: actions/cache@v1
@@ -54,7 +55,8 @@ jobs:
           key: ${{ matrix.build }}-cargo-index-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ matrix.build }}-cargo-index-
-        if: env.IS_MD_FILE == 'false'
+          # HACK(@ohsayan): The next line skips caching until it is fixed
+        if: runner.os != 'macOS' && env.IS_MD_FILE == 'false'
 
       - name: Cache Cargo build
         uses: actions/cache@v1
@@ -63,7 +65,8 @@ jobs:
           key: ${{ matrix.build }}-target-${{ hashFiles('**/Cargo.lock') }}
           restore-keys: |
             ${{ matrix.build }}-target-
-        if: env.IS_MD_FILE == 'false'
+          # HACK(@ohsayan): The next line skips caching until it is fixed
+        if: runner.os != 'macOS' && env.IS_MD_FILE == 'false'
 
       - name: Install Rust
         run: |
@@ -93,4 +96,4 @@ jobs:
         env:
           RUST_BACKTRACE: 1
         shell: cmd
-        if: env.IS_MD_FILE == 'false' && runner.os == 'Windows'
+        if: env.IS_MD_FILE == 'false' && runner.os == 'Windows'
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 3fc07f35..3bd05aa0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ data.bin
 /server/snapshots
 snapstore.bin
 snapstore.partmap
-/snapshots 
\ No newline at end of file
+/snapshots 
+/.idea
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1ead40c1..4ce8b6f5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
   <component name="CMakeRunConfigurationManager" shouldGenerate="true" shouldDeleteObsolete="true">
     <generated />
   </component>
@@ -13,7 +16,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="05446e12-25fb-4f56-ae52-664b69a61212" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/server/src/main.rs" beforeDir="false" afterPath="$PROJECT_DIR$/server/src/main.rs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -52,9 +55,11 @@
     <property name="last_opened_file_path" value="$PROJECT_DIR$" />
     <property name="nodejs_package_manager_path" value="npm" />
     <property name="org.rust.cargo.project.model.PROJECT_DISCOVERY" value="true" />
+    <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
   </component>
   <component name="RustProjectSettings">
     <option name="toolchainHomeDirectory" value="$USER_HOME$/.cargo/bin" />
+    <option name="version" value="2" />
   </component>
   <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
@@ -66,10 +71,25 @@
       <updated>1610003825159</updated>
       <workItem from="1610003832233" duration="85000" />
       <workItem from="1610003959549" duration="724000" />
+      <workItem from="1617377877310" duration="374000" />
+      <workItem from="1617378285715" duration="53000" />
+      <workItem from="1617378359828" duration="613000" />
     </task>
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
     <option name="version" value="3" />
   </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+    <option name="oldMeFiltersMigrated" value="true" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 593eef16..11ba14fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -531,9 +531,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.24"
+version = "1.0.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
+checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
 dependencies = [
  "unicode-xid",
 ]
@@ -757,9 +757,9 @@ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
 
 [[package]]
 name = "syn"
-version = "1.0.66"
+version = "1.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c193d6a9455d05405156b3a4cc04bd20b9ca1745bf6198e1258418f852b967b"
+checksum = "3ce15dd3ed8aa2f8eeac4716d6ef5ab58b6b9256db41d7e1a0224c2788e8fd87"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/sky-macros/Cargo.toml b/sky-macros/Cargo.toml
index 7c9b9e7a..8a06fc68 100644
--- a/sky-macros/Cargo.toml
+++ b/sky-macros/Cargo.toml
@@ -10,7 +10,7 @@ edition = "2018"
 proc-macro = true
 
 [dependencies]
-syn = {version = "1.0.65", features = ["full"]}
+syn = {version = "1.0.68", features = ["full"]}
 quote = "1.0.9"
 rand = "0.8.3"
-proc-macro2 = "1.0.24"
+proc-macro2 = "1.0.26"