Promote instance cache to class