I'm not sure about this. The issue to be fixed occurs because after merge the correct found=true was overwritten by a cached Geocache with found=null.

Maybe the best way would be to move this part out of the if-statement and merge by comparing the timestamps.