fixed search crash
More cache changes