Remove optional search caching

The search caching experiment did not provide enough value for the
complexity it added. Could revisit in future.
Fix dialyzer warning for conflict message helper
Merge branch 'sf/remove-search-cache'