Changes on DataController and Cache

Some changes to improve cache hit.