Move cache did creation to appropriate class, small pert improvement..