Modify generic in cache layer.
Improve Cache implementation