Changes for Cache and first start in User