Merge "Revert "Synchronize cache-is-ready boolean with cache readiness."" into tm-dev