Improved TestCanvas behavior when scale != 1; Modified CachedCellSet logic.