re-added caching for demo