diff --git a/src/ssl.c b/src/ssl.c
index 23f72808e..fc971f834 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -2699,7 +2699,13 @@ typedef struct {
 /* get how big the the session cache save buffer needs to be */
 int CyaSSL_get_session_cache_memsize(void)
 {
-    return (int)(sizeof(SessionCache) + sizeof(cache_header_t));
+    int sz  = (int)(sizeof(SessionCache) + sizeof(cache_header_t));
+
+    #ifndef NO_CLIENT_CACHE
+        sz += (int)(sizeof(ClientCache));
+    #endif
+
+    return sz;
 }