support lazy load cache
Merge branch 'marxo'
version bump to 2.0 for new server script