Fix heatmap layer font marshaling
Cache at heatmap level