Avoid re-retrieval of singleton bean instances

Issue: SPR-10663
Polishing

Issue: SPR-10657
Upgraded to AspectJ 1.8.0.M1

Issue: SPR-10558