Added feature state cache