Minor fixes + preparing cache.
Resolved merge conflicts.