:add: lock in cache storage
:fix: bug on cache storage