Fixing bugs / adding tests for null field list when interacting with cache