Fixed metod signature. Fixed small typo
Merge branch 'cache-proposal' into extended-cache-proposal