1. Add caching.
2. Clean up spring component scanning
Add forgotten files