Moved state cache values into another structure for cleanness

Signed-off-by: Ian Bell <ian.h.bell@gmail.com>