Also cache single bond counts and reuse piBond counts

Change-Id: I740df98f140f3b12213a4b6b49827511af395ec1