First draft at APC caching of searches. Fix #11