Fix #35
Fix #36
Cache Uri location for custom interceptor
Custom engine test
Code cleaning