First attempt of a fix of cache problems