Added cache layer for searches