Fixed cache issues, and also fixed search