Merge "Converting StringCache to immutable kotlin data class" into main