Further cleanups. Updates on cachings.