To me it looks like the code of parseSmallCache is now basically duplicate. Can't we simply call parseSmallCache from parseCache (and remove the duplicate lines here), under the assumption that the small cache properties are always a subset of the normal cache properties?