[WIP] Making cache key depend on fields (switching branches)