applied state caching
applied entity caching
state fixes
cache fix