Introduced a CachedPropertyMappingFactory class
Fixed event listeners tests
Removed useless else statements
Renamed drivers
Added missing check in PropertyMappingFactory