Finished search future, reorganized service and caching