Instead of replicating code in state_store here, does it make sense to
move into a common part, so that fixes/optimization can be done in one
place?
Also why another config? If this has proven benefit then it can be
default path.

I agree. I will resend the patch if this patch is agreed to be useful.