[Loader, Canvas] update cache store mechanics for the canvases to work with multiple canvas installation;
post-CR fixes