Wip remove duplicated cache lock