Another quick save

Trying to sort out why cached data is throwing NPEs