changing cache locks
Merge branch 'master' of ssh://github.com/NavJ/proxy
small thread fix