GeoFence: fix cache setup
Merge remote-tracking branch 'upstream/master'