Split up some methods ready for doing NP cache