diff --git a/msgpack.c b/msgpack.c
index 8028f01..1d332b5 100644
--- a/msgpack.c
+++ b/msgpack.c
@@ -99,10 +99,10 @@ static ZEND_MINIT_FUNCTION(msgpack) /* {{{ */ {
 #endif
 
 #if defined(HAVE_APCU_SUPPORT)
-	apc_register_serializer("msgpack",
-		APC_SERIALIZER_NAME(msgpack),
-		APC_UNSERIALIZER_NAME(msgpack),
-		NULL TSRMLS_CC);
+    apc_register_serializer("msgpack",
+        APC_SERIALIZER_NAME(msgpack),
+        APC_UNSERIALIZER_NAME(msgpack),
+        NULL);
 #endif
 
     msgpack_init_class();
@@ -128,7 +128,9 @@ static ZEND_MINFO_FUNCTION(msgpack) /* {{{ */ {
     php_info_print_table_row(2, "Session Support", "enabled" );
 #endif
 #if defined(HAVE_APCU_SUPPORT)
-	php_info_print_table_row(2, "APCu Serializer Support", "enabled" );
+    php_info_print_table_row(2, "MessagePack APCu Serializer ABI", APC_SERIALIZER_ABI);
+#else
+    php_info_print_table_row(2, "MessagePack APCu Serializer ABI", "no");
 #endif
     php_info_print_table_row(2, "extension Version", PHP_MSGPACK_VERSION);
     php_info_print_table_row(2, "header Version", MSGPACK_VERSION);
@@ -321,49 +323,25 @@ static ZEND_FUNCTION(msgpack_unserialize) /* {{{ */ {
 /* }}} */
 
 #if defined(HAVE_APCU_SUPPORT)
-/* {{{ apc_serialize function */
-static int APC_SERIALIZER_NAME(msgpack) ( APC_SERIALIZER_ARGS ) {
-	(void)config;
-
-	smart_str res = {0};
-	msgpack_serialize_data_t var_hash;
-
-	msgpack_serialize_var_init(&var_hash);
-	msgpack_serialize_zval(&res, (zval *) value, var_hash);
-	msgpack_serialize_var_destroy(&var_hash);
-
-	smart_str_0(&res);
-
-	*buf = (unsigned char *) estrndup(ZSTR_VAL(res.s), ZSTR_LEN(res.s));
-	*buf_len = ZSTR_LEN(res.s);
-
-	return 1;
+static int APC_SERIALIZER_NAME(msgpack) ( APC_SERIALIZER_ARGS ) /* {{{ */ {
+    smart_str res = {0};
+    php_msgpack_serialize(&res, (zval *) value);
+
+    if (res.s) {
+        smart_str_0(&res);
+        *buf = (unsigned char *) estrndup(ZSTR_VAL(res.s), ZSTR_LEN(res.s));
+        *buf_len = ZSTR_LEN(res.s);
+        return 1;
+    }
+    return 0;
 }
 /* }}} */
-/* {{{ apc_unserialize function */
-static int APC_UNSERIALIZER_NAME(msgpack) ( APC_UNSERIALIZER_ARGS ) {
-	(void)config;
-
-	int ret;
-	msgpack_unpack_t mp;
-	msgpack_unserialize_data_t var_hash;
-	size_t off = 0;
 
-	template_init(&mp);
-
-	msgpack_unserialize_var_init(&var_hash);
-
-	mp.user.retval = value;
-	mp.user.var_hash = &var_hash;
-
-	ret = template_execute(&mp, (char *) buf, buf_len, &off);
-	if (Z_TYPE_P(mp.user.retval) == IS_REFERENCE) {
-		ZVAL_DEREF(mp.user.retval);
-	}
-
-	msgpack_unserialize_var_destroy(&var_hash, 0);
-
-	return ret == MSGPACK_UNPACK_EXTRA_BYTES || ret == MSGPACK_UNPACK_SUCCESS;
+static int APC_UNSERIALIZER_NAME(msgpack) ( APC_UNSERIALIZER_ARGS ) /* {{{ */ {
+    if (buf_len > 0 && php_msgpack_unserialize(value, buf, buf_len) == SUCCESS) {
+        return 1;
+    }
+    return 0;
 }
 /* }}} */
 #endif
diff --git a/tests/029.phpt b/tests/029.phpt
index 71a1b56..45eb732 100644
--- a/tests/029.phpt
+++ b/tests/029.phpt
@@ -44,7 +44,7 @@ msgpack
 
 MessagePack Support => enabled
 Session Support => enabled
-APCu Serializer Support => enabled
+MessagePack APCu Serializer ABI => %s
 extension Version => %s
 header Version => %s
 
diff --git a/tests/apcu.phpt b/tests/apcu.phpt
new file mode 100644
index 0000000..0f3489e
--- /dev/null
+++ b/tests/apcu.phpt
@@ -0,0 +1,63 @@
+--TEST--
+APCu serialization
+--INI--
+apc.enabled=1
+apc.enable_cli=1
+apc.serializer=msgpack
+--SKIPIF--
+<?php
+if (!extension_loaded("msgpack")) print "skip";
+if (!extension_loaded("apcu")) {
+   echo "skip needs APCu enabled";
+}
+?>
+--FILE--
+<?php
+echo ini_get('apc.serializer'), "\n";
+
+apcu_store('foo', 100);
+var_dump(apcu_fetch('foo'));
+
+$foo = 'hello world';
+
+apcu_store('foo', $foo);
+var_dump(apcu_fetch('foo'));
+
+apcu_store('foo\x00bar', $foo);
+var_dump(apcu_fetch('foo\x00bar'));
+
+apcu_store('foo', ['foo' => $foo]);
+var_dump(apcu_fetch('foo'));
+
+class Foo {
+    public $int = 10;
+    protected $array = [];
+    private $string = 'foo';
+}
+
+$a = new Foo;
+apcu_store('foo', $a);
+unset($a);
+var_dump(apcu_fetch('foo'));
+
+?>
+===DONE===
+--EXPECT--
+msgpack
+int(100)
+string(11) "hello world"
+string(11) "hello world"
+array(1) {
+  ["foo"]=>
+  string(11) "hello world"
+}
+object(Foo)#1 (3) {
+  ["int"]=>
+  int(10)
+  ["array":protected]=>
+  array(0) {
+  }
+  ["string":"Foo":private]=>
+  string(3) "foo"
+}
+===DONE===