reduced master cache workaround to necessary minimum