[PATCH] Make cache keys ignore unimportant fields