Fix image info cache handling

wallpanel.js

@@ -1616,6 +1616,9 @@ class WallpanelView extends HuiView {
 				}
 				val = date.toLocaleDateString(elHass.__hass.locale.language, options);
 			}
+			if (typeof val === 'object') {
+				val = JSON.stringify(val);
+			}
 			return prefix + val + suffix;
 		});
 		infoElement.innerHTML = html;
@@ -1778,7 +1781,7 @@ class WallpanelView extends HuiView {
 		http.send();
 	}
 
-	updateImageFromUrl(img, url) {
+	fillPlaceholders(url) {
 		let width = this.screensaverContainer.clientWidth;
 		let height = this.screensaverContainer.clientHeight;
 		let timestamp_ms = Date.now();
@@ -1787,12 +1790,20 @@ class WallpanelView extends HuiView {
 		url = url.replace(/\${height}/g, height);
 		url = url.replace(/\${timestamp_ms}/g, timestamp_ms);
 		url = url.replace(/\${timestamp}/g, timestamp);
-		img.imageUrl = url;
-		logger.debug(`Updating image '${img.id}' from '${url}'`);
+		return url;
+	}
+
+	updateImageFromUrl(img, url) {
+		const realUrl = this.fillPlaceholders(url);
+		if (realUrl != url && imageInfoCache[url]) {
+			imageInfoCache[realUrl] = imageInfoCache[url];
+		}
+		img.imageUrl = realUrl;
+		logger.debug(`Updating image '${img.id}' from '${realUrl}'`);
 		if (imageSourceType() == "media-entity") {
-			this.updateImageUrlWithHttpFetch(img, url);
+			this.updateImageUrlWithHttpFetch(img, realUrl);
 		} else {
-			img.src = url;
+			img.src = realUrl;
 		}
 	}