Work on #373
Merge branch 'android-l' into sites
Added caching fix #380