cache controller adjustments and improvements

related to #4792, close #4874