Fix cache policy calculation#2197

glasser merged 2 commits into

apollographql:masterapollographql/apollo-server:masterfrom

fabsrc:fix/cache-policy-calculationCopy head branch name to clipboard