Components refresh

https://hibernate.onjira.com/browse/OGM-269
https://hibernate.onjira.com/browse/OGM-259
https://hibernate.onjira.com/browse/OGM-268