Adding timeout to put calls to avoid deadlock on exception
Fix + test for issue when resolving from subdirectory
Fixing crash when initializing cache directory