Cache fix, removed unneeded cache instances. Small UI improvements.