Fixes for NETWORK_ENABLED cache