added lock release before returning null in cache something
added lock release before returning null in cache something without swp file
fixed conflicts