Adjusted RTStateCache to riemann events. First test passes