Add cache and request adapters; other updates