Refactored Search service, added cache layer and renamed class.