Partial fix for Interactions and Cached canvas.
Further investigation of cache redraw needed