Made Cache factory aware
0.6.2