Merge pull request #1630 from tomusborne/fix/inline-dynamic-bgs

Fix: Inline dynamic bgs

src/editor/style-html-attribute.js

@@ -43,8 +43,8 @@ addFilter(
 		}
 
 		// Get the cached result if available.
-		if ( cache[ clientId ][ style ] ) {
-			return cache[ style ];
+		if ( cache[ blockCacheKey ][ style ] ) {
+			return cache[ blockCacheKey ][ style ];
 		}
 
 		const replacements = await replaceTags( { content: style, context, clientId } );
@@ -53,9 +53,6 @@ addFilter(
 			return style;
 		}
 
-		// Cache the result.
-		cache[ clientId ][ style ] = replacements;
-
 		const withReplacements = replacements.reduce( ( acc, { original, replacement, fallback } ) => {
 			if ( ! replacement ) {
 				return acc.replaceAll( original, fallback );
@@ -64,6 +61,11 @@ addFilter(
 			return acc.replaceAll( original, replacement );
 		}, style );
 
-		return withReplacements ? withReplacements : style;
+		const newStyle = withReplacements ? withReplacements : style;
+
+		// Cache the result.
+		cache[ blockCacheKey ][ style ] = newStyle;
+
+		return newStyle;
 	}
 );