Merge "Mark FileCache initialized after init really goes through." into jb-dev