Added support for rename axis, fixed caching logic as different datasets
can be plotted on an axis, rewrote servicing of 1D plots