Updated tests and improved search local cache funcationality.