Move cache related helper to the right class