Guard against null options throwing exception
Change to unique cache name
Switch test to Integration
Merge branch 'develop' into ui/dev