3-2-1 bug fix, master data cache