cache map saved at end of requests
Merge branch 'u/fewer-cachemap-saves' into development