Scaladoc + add missing prepForCaching