Added M2M and L2L caching.