Merge "Adds a cached phone factory." into master-nova