turn caching on
line endings
merge of master into fixsearching