diff --git a/src/memcache.c b/src/memcache.c
index c05105a..82cfaf7 100644
--- a/src/memcache.c
+++ b/src/memcache.c
@@ -375,6 +375,9 @@ static zend_function_entry php_memcache_class_functions[] = {
 	ZEND_FE_END
 };
 
+#define Z_MEMCACHE_CONNECTION_P(zv) OBJ_PROP_NUM(Z_OBJ_P(zv), 0)
+#define Z_MEMCACHE__FAILURECALLBACK_P(zv) OBJ_PROP_NUM(Z_OBJ_P(zv), 1)
+
 /* }}} */
 
 /* {{{ memcache_module_entry
@@ -737,6 +740,30 @@ PHP_MINIT_FUNCTION(memcache)
 	INIT_CLASS_ENTRY(ce, "Memcache", php_memcache_class_functions);
 	memcache_ce = zend_register_internal_class_ex(&ce, memcache_pool_ce);
 
+	zval property_connection_default_value;
+	ZVAL_NULL(&property_connection_default_value);
+	zend_string *property_connection_name = zend_string_init("connection", sizeof("connection") - 1, 1);
+	zend_declare_typed_property(memcache_ce, property_connection_name, &property_connection_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ANY));
+	zend_string_release(property_connection_name);
+
+	zval property_failure_callback_default_value;
+	ZVAL_NULL(&property_failure_callback_default_value);
+	zend_string *property_failure_callback_name = zend_string_init("_failureCallback", sizeof("_failureCallback") - 1, 1);
+	zend_declare_typed_property(memcache_ce, property_failure_callback_name, &property_failure_callback_default_value, ZEND_ACC_PRIVATE, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_CALLABLE|MAY_BE_NULL));
+	zend_string_release(property_failure_callback_name);
+
+	zval property_username_default_value;
+	ZVAL_NULL(&property_username_default_value);
+	zend_string *property_username_name = zend_string_init("username", sizeof("username") - 1, 1);
+	zend_declare_typed_property(memcache_ce, property_username_name, &property_username_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
+	zend_string_release(property_username_name);
+
+	zval property_password_default_value;
+	ZVAL_NULL(&property_password_default_value);
+	zend_string *property_password_name = zend_string_init("password", sizeof("password") - 1, 1);
+	zend_declare_typed_property(memcache_ce, property_password_name, &property_password_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_STRING|MAY_BE_NULL));
+	zend_string_release(property_password_name);
+
 	le_memcache_pool = zend_register_list_destructors_ex(_mmc_pool_list_dtor, NULL, "memcache connection", module_number);
 	le_memcache_server = zend_register_list_destructors_ex(NULL, _mmc_server_list_dtor, "persistent memcache connection", module_number);
 
@@ -813,7 +840,7 @@ static int mmc_get_pool(zval *id, mmc_pool_t **pool) /* {{{ */
 {
 	zval *zv;
 
-	if (Z_TYPE_P(id) != IS_OBJECT || (zv = zend_hash_str_find(Z_OBJPROP_P(id), "connection", sizeof("connection")-1)) == NULL) {
+	if (Z_TYPE_P(id) != IS_OBJECT || (zv = Z_MEMCACHE_CONNECTION_P(id)) == NULL || Z_TYPE_P(zv) == IS_NULL) {
 		php_error_docref(NULL, E_WARNING, "No servers added to memcache connection");
 		return 0;
 	}
@@ -1233,11 +1260,11 @@ static mmc_t *php_mmc_pool_addserver(
 		return NULL;
 	}
 	/* initialize pool if need be */
-	if ((connection = zend_hash_str_find(Z_OBJPROP_P(mmc_object), "connection", sizeof("connection")-1)) == NULL) {
+	if (Z_TYPE_P(connection = Z_MEMCACHE_CONNECTION_P(mmc_object)) != IS_RESOURCE) {
 		pool = mmc_pool_new();
 		pool->failure_callback = (mmc_failure_callback) &php_mmc_failure_callback;
 		list_res = zend_register_resource(pool, le_memcache_pool);
-		add_property_resource(mmc_object, "connection", list_res);
+		ZVAL_RES(Z_MEMCACHE_CONNECTION_P(mmc_object), list_res);
 
 #if PHP_VERSION_ID < 70300
 		GC_REFCOUNT(list_res)++;
@@ -1333,7 +1360,7 @@ static void php_mmc_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool persistent)
 		list_res = zend_register_resource(pool, le_memcache_pool);
 		mmc_object = return_value;
 		object_init_ex(mmc_object, memcache_ce);
-		add_property_resource(mmc_object, "connection", list_res);
+		ZVAL_RES(Z_MEMCACHE_CONNECTION_P(mmc_object), list_res);
 #if PHP_VERSION_ID < 70300
 		GC_REFCOUNT(list_res)++;
 #else
@@ -1486,7 +1513,7 @@ static void php_mmc_failure_callback(mmc_pool_t *pool, mmc_t *mmc, zval *param)
 	zval *callback;
 
 	/* check for userspace callback */
-	if (!Z_ISUNDEF_P(param) && (callback = zend_hash_str_find(Z_OBJPROP_P((zval *)param), "_failureCallback", sizeof("_failureCallback")-1)) != NULL && Z_TYPE_P(callback) != IS_NULL) {
+	if (!Z_ISUNDEF_P(param) && (callback = Z_MEMCACHE__FAILURECALLBACK_P(param)) != NULL && Z_TYPE_P(callback) != IS_NULL) {
 		if (MEMCACHE_IS_CALLABLE(callback, 0, NULL)) {
 			zval retval;
 			zval *host, *tcp_port, *udp_port, *error, *errnum;
@@ -1546,7 +1573,7 @@ static void php_mmc_set_failure_callback(mmc_pool_t *pool, zval *mmc_object, zva
 		callback_tmp = *callback;
 		zval_copy_ctor(&callback_tmp);
 
-		add_property_zval(mmc_object, "_failureCallback", &callback_tmp);
+		ZVAL_COPY(Z_MEMCACHE__FAILURECALLBACK_P(mmc_object), &callback_tmp);
 
 		zval_ptr_dtor(&callback_tmp);
 
@@ -1554,7 +1581,7 @@ static void php_mmc_set_failure_callback(mmc_pool_t *pool, zval *mmc_object, zva
 		Z_ADDREF_P(mmc_object);
 	}
 	else {
-		add_property_null(mmc_object, "_failureCallback");
+		ZVAL_NULL(Z_MEMCACHE__FAILURECALLBACK_P(mmc_object));
 		ZVAL_UNDEF(&pool->failure_callback_param);
 	}
 }
diff --git a/tests/017.phpt b/tests/017.phpt
index 258f016..730f91d 100644
--- a/tests/017.phpt
+++ b/tests/017.phpt
@@ -26,5 +26,11 @@ foo
 object(test)%s%d) {
   ["connection"]=>
   resource(%d) of type (memcache connection)
+  ["_failureCallback":"Memcache":private]=>
+  NULL
+  ["username"]=>
+  NULL
+  ["password"]=>
+  NULL
 }
 Done
diff --git a/tests/029.phpt b/tests/029.phpt
index bcacf33..919f6a6 100644
--- a/tests/029.phpt
+++ b/tests/029.phpt
@@ -44,7 +44,8 @@ if (is_array($result))
 	sort($result);
 var_dump($result);
 
-$result = ini_set('memcache.allow_failover', "abc");
+// @ is to prevent warning on 8.2
+$result = @ini_set('memcache.allow_failover', "abc");
 var_dump($result);
 
 ?>
diff --git a/tests/045.phpt b/tests/045.phpt
index e1c10ec..6d7122f 100644
--- a/tests/045.phpt
+++ b/tests/045.phpt
@@ -8,6 +8,8 @@ Nested get's in __wakeup()
 include 'connect.inc';
 
 class testclass {
+    public $result;
+
 	function __wakeup() {
 		global $memcache;
 		$this->result = $memcache->get('_test_key3');
diff --git a/tests/059.phpt b/tests/059.phpt
index c7c3d21..724bdb4 100644
--- a/tests/059.phpt
+++ b/tests/059.phpt
@@ -302,7 +302,11 @@ Class [ <internal:memcache> class Memcache extends MemcachePool ] {
   - Static methods [0] {
   }
 
-  - Properties [0] {
+  - Properties [4] {
+    Property [ public mixed $connection = NULL ]
+    Property [ private ?callable $_failureCallback = NULL ]
+    Property [ public ?string $username = NULL ]
+    Property [ public ?string $password = NULL ]
   }
 
   - Methods [24] {
diff --git a/tests/101.phpt b/tests/101.phpt
new file mode 100644
index 0000000..bb1a36c
--- /dev/null
+++ b/tests/101.phpt
@@ -0,0 +1,23 @@
+--TEST--
+memcache->setSaslAuthData() and memcache_set_sasl_auth_data()
+--SKIPIF--
+<?php include 'connect.inc'; ?>
+--FILE--
+<?php
+include 'connect.inc';
+
+$memcache->setSaslAuthData('testuser1', 'testpassword1');
+
+var_dump($memcache->username);
+var_dump($memcache->password);
+
+memcache_set_sasl_auth_data($memcache, 'testuser2', 'testpassword2');
+
+var_dump($memcache->username);
+var_dump($memcache->password);
+
+--EXPECTF--
+string(9) "testuser1"
+string(13) "testpassword1"
+string(9) "testuser2"
+string(13) "testpassword2"
\ No newline at end of file