Remove cache workaround