Improved caching support
Merge branch 'master' of git://github.com/Prodevelop/POIProxy