Fix for android state caching