Pull out search caching for now

It appears to be broken in non-trivial ways