WIP on caching issue
WIP - Still sorting cachint issue