Comment out demo app code
Add cache layers to both location and entity searches