Fixing bugs in data cache