diff --git a/library/ssl_cache.c b/library/ssl_cache.c
index e05bd88..162b47a 100644
--- a/library/ssl_cache.c
+++ b/library/ssl_cache.c
@@ -86,11 +86,11 @@
 
         if( session->ciphersuite != entry->session.ciphersuite ||
             session->compression != entry->session.compression ||
-            session->length != entry->session.length )
+            session->id_len != entry->session.id_len )
             continue;
 
         if( memcmp( session->id, entry->session.id,
-                    entry->session.length ) != 0 )
+                    entry->session.id_len ) != 0 )
             continue;
 
         memcpy( session->master, entry->session.master, 48 );
@@ -167,7 +167,7 @@
         }
 #endif
 
-        if( memcmp( session->id, cur->session.id, cur->session.length ) == 0 )
+        if( memcmp( session->id, cur->session.id, cur->session.id_len ) == 0 )
             break; /* client reconnected, keep timestamp for session id */
 
 #if defined(MBEDTLS_HAVE_TIME)