diff --git a/tests/phpunit/test-cache.php b/tests/phpunit/test-cache.php
index 65002b3..1e87725 100644
--- a/tests/phpunit/test-cache.php
+++ b/tests/phpunit/test-cache.php
@@ -117,6 +117,13 @@ public function test_normalize_address_key() {
 		$this->assertEquals( 255, strlen( $ascii_over_max_address->serialize() ) );
 	}
 
+	public function test_save_emoji_to_cache() {
+		$this->cache->set( 'foo', '❤️' );
+		// Re-initialize the cache.
+		$this->cache =& $this->init_cache();
+		$this->assertEquals( '❤️', $this->cache->get( 'foo' ) );
+	}
+
 	public function test_loaded() {
 		$this->assertTrue( WP_LCACHE_OBJECT_CACHE );
 	}
@@ -1003,7 +1010,7 @@ public function test_invalid_schema_produces_warning() {
 		$this->altered_value_column = true;
 		$ret = $wpdb->get_results( "SHOW CREATE TABLE `{$table_prefix}lcache_events`" );
 		// @codingStandardsIgnoreEnd
-		$this->assertContains( '`value` varchar(2) COLLATE utf8mb4_unicode_ci DEFAULT NULL,', $ret[0]->{'Create Table'} );
+		$this->assertContains( '`value` varchar(2) DEFAULT NULL,', $ret[0]->{'Create Table'} );
 		$this->cache->set( 'foo', 'basjkfsdfsdksd' );
 	}
 
diff --git a/wp-lcache.php b/wp-lcache.php
index 0c62bbc..b8a04f3 100644
--- a/wp-lcache.php
+++ b/wp-lcache.php
@@ -3,7 +3,7 @@
  * Plugin Name: WP LCache
  * Plugin URI: https://github.com/pantheon-systems/wp-lcache/
  * Description: Supercharge your WP Object Cache with LCache, a persistent, performant, and multi-layer cache library.
- * Version: 0.6.0
+ * Version: 0.6.1-alpha
  * Author: Pantheon, Daniel Bachhuber
  * Author URI: https://pantheon.io/
  * License: GPL-2.0
@@ -34,15 +34,6 @@
 function wp_lcache_initialize_database_schema() {
 	global $wpdb;
 
-	$charset_collate = $wpdb->get_charset_collate();
-	// Barracuda needs ROW_FORMAT=DYNAMIC when using utf8mb4
-	if ( false !== stripos( $charset_collate, 'utf8mb4' ) ) {
-		$innodb_file_format = $wpdb->get_var( 'SELECT @@innodb_file_format' );
-		if ( false !== stripos( $innodb_file_format, 'Barracuda' ) ) {
-			$charset_collate .= ' ROW_FORMAT=DYNAMIC';
-		}
-	}
-
 	// @codingStandardsIgnoreStart
 	$events_table = $GLOBALS['table_prefix'] . 'lcache_events';
 	$wpdb->query( "CREATE TABLE IF NOT EXISTS `{$events_table}` (
@@ -56,15 +47,15 @@ function wp_lcache_initialize_database_schema() {
 		UNIQUE KEY `event_id` (`event_id`),
 		KEY `expiration` (`expiration`),
 		KEY `lookup_miss` (`address`,`event_id`)
-		) {$charset_collate};" );
+		) ENGINE=InnoDB DEFAULT CHARSET=utf8;" );
 
 	$tags_table = $GLOBALS['table_prefix'] . 'lcache_tags';
 	$wpdb->query( "CREATE TABLE IF NOT EXISTS `{$tags_table}` (
-		`tag` varchar(191) NOT NULL DEFAULT '',
-		`address` varchar(191) NOT NULL DEFAULT '',
+		`tag` varchar(255) NOT NULL DEFAULT '',
+		`address` varchar(255) NOT NULL DEFAULT '',
 		PRIMARY KEY (`tag`,`address`),
 		KEY `rewritten_entry` (`address`)
-		) {$charset_collate};" );
+		) ENGINE=InnoDB DEFAULT CHARSET=utf8;" );
 	// @codingStandardsIgnoreEnd
 }