Another attempt at fixing AWS removing cache