Lots of setting cache issues resolved for issue #990
Resolves issue #936