Fixed caching and update of lockable in cache when locking