#592 #642 OPUser now cached and OPDatastoreDelegateImpl now optimized, more tidy up