Refactoring complete. Added Cache to Search Prompt