diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 76b7d41..179e3a6 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -252,10 +252,6 @@ void QSslCertificate::clear()
 */
 QByteArray QSslCertificate::version() const
 {
-    if (d->versionString.isEmpty() && d->x509)
-        d->versionString =
-            QByteArray::number(qlonglong(q_ASN1_INTEGER_get(d->x509->cert_info->version)) + 1);
-
     return d->versionString;
 }
 
@@ -267,22 +263,6 @@ QByteArray QSslCertificate::version() const
 */
 QByteArray QSslCertificate::serialNumber() const
 {
-    if (d->serialNumberString.isEmpty() && d->x509) {
-        ASN1_INTEGER *serialNumber = d->x509->cert_info->serialNumber;
-        // if we cannot convert to a long, just output the hexadecimal number
-        if (serialNumber->length > 4) {
-            QByteArray hexString;
-            hexString.reserve(serialNumber->length * 3);
-            for (int a = 0; a < serialNumber->length; ++a) {
-                hexString += QByteArray::number(serialNumber->data[a], 16).rightJustified(2, '0');
-                hexString += ':';
-            }
-            hexString.chop(1);
-            d->serialNumberString = hexString;
-        } else {
-            d->serialNumberString = QByteArray::number(qlonglong(q_ASN1_INTEGER_get(serialNumber)));
-        }
-    }
     return d->serialNumberString;
 }
 
@@ -621,8 +601,25 @@ void QSslCertificatePrivate::init(const QByteArray &data, QSsl::EncodingFormat f
             : certificatesFromDer(data, 1);
         if (!certs.isEmpty()) {
             *this = *certs.first().d;
-            if (x509)
+            if (x509) {
                 x509 = q_X509_dup(x509);
+                versionString = QByteArray::number(qlonglong(q_ASN1_INTEGER_get(x509->cert_info->version)) + 1);
+                // Sets the serial number string
+                ASN1_INTEGER *serialNumber = x509->cert_info->serialNumber;
+                // if we cannot convert to a long, just output the hexadecimal number
+                if (serialNumber->length > 4) {
+                    QByteArray hexString;
+                    hexString.reserve(serialNumber->length * 3);
+                    for (int a = 0; a < serialNumber->length; ++a) {
+                        hexString += QByteArray::number(serialNumber->data[a], 16).rightJustified(2, '0');
+                        hexString += ':';
+                    }
+                    hexString.chop(1);
+                    serialNumberString = hexString;
+                } else {
+                    serialNumberString = QByteArray::number(qlonglong(q_ASN1_INTEGER_get(serialNumber)));
+                }
+            }
         }
     }
 }