merge fixes and beginnings of testing for localCahce

author: nhhughes