[96] Removed unused chaching code.

* Fixed update query.
* Code cleanups.
* Coding style corrections.