diff --git a/libpEpAdapter/libpEpAdapter.vcxproj b/libpEpAdapter/libpEpAdapter.vcxproj
index c6b3e7e..e5cec6a 100644
--- a/libpEpAdapter/libpEpAdapter.vcxproj
+++ b/libpEpAdapter/libpEpAdapter.vcxproj
@@ -99,6 +99,7 @@ XCOPY "$(SolutionDir)libpEpAdapter\*.hxx" "$(SolutionDir)pEp\" /I/F/Y
     <ClCompile Include="..\Adapter.cc" />
     <ClCompile Include="..\callback_dispatcher.cc" />
     <ClCompile Include="..\call_with_lock.cc" />
+    <ClCompile Include="..\message_cache.cc" />
     <ClCompile Include="..\passphrase_cache.cc" />
     <ClCompile Include="..\slurp.cc" />
     <ClCompile Include="..\status_to_string.cc" />
@@ -108,6 +109,7 @@ XCOPY "$(SolutionDir)libpEpAdapter\*.hxx" "$(SolutionDir)pEp\" /I/F/Y
     <ClInclude Include="..\Adapter.hxx" />
     <ClInclude Include="..\callback_dispatcher.hh" />
     <ClInclude Include="..\locked_queue.hh" />
+    <ClInclude Include="..\message_cache.hh" />
     <ClInclude Include="..\passphrase_cache.hh" />
     <ClInclude Include="..\passphrase_cache.hxx" />
     <ClInclude Include="..\pc_container.hh" />
diff --git a/libpEpAdapter/libpEpAdapter.vcxproj.filters b/libpEpAdapter/libpEpAdapter.vcxproj.filters
index d40aa0e..da8e8f7 100644
--- a/libpEpAdapter/libpEpAdapter.vcxproj.filters
+++ b/libpEpAdapter/libpEpAdapter.vcxproj.filters
@@ -36,6 +36,9 @@
     <ClCompile Include="..\callback_dispatcher.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\message_cache.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Adapter.hh">
@@ -68,5 +71,8 @@
     <ClInclude Include="..\Semaphore.hh">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\message_cache.hh">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/message_cache.cc b/message_cache.cc
index 6ca47cf..5fd66e5 100644
--- a/message_cache.cc
+++ b/message_cache.cc
@@ -280,7 +280,7 @@ namespace pEp {
         full->attachments = nullptr;
     }
 
-    DYNAMIC_API PEP_STATUS MessageCache::decrypt_message(
+    PEP_STATUS MessageCache::decrypt_message(
             PEP_SESSION session,
             message *src,
             message **dst,
@@ -319,7 +319,7 @@ namespace pEp {
         return status;
     }
 
-    DYNAMIC_API PEP_STATUS MessageCache::mime_encode_message(
+    PEP_STATUS MessageCache::mime_encode_message(
             which one,
             const message * msg,
             bool omit_fields,