Used same fix as for org.genericsystem.impl layer in
org.genericsystem.cache in order to solve the ClassCastException issue.