Minor data internal cache issue fix